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

[PATCH] Asoc: wm_adsp: Add support for loading firmware with prefix name
by Jianhua Lu 29 Mar '23

29 Mar '23

For platform using fdt, system_name is NULL, it doesn't provide a way to load firmware with prefix name, so add it. Signed-off-by: Jianhua Lu <lujianhua000(a)gmail.com> --- sound/soc/codecs/wm_adsp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 216120b68b64..17481e42d440 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -760,6 +760,10 @@ static int wm_adsp_request_firmware_file(struct wm_adsp *dsp, *filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file, system_name, filetype); + else if (asoc_component_prefix) + *filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part, + dsp->fwf_name, wm_adsp_fw[dsp->fw].file, asoc_component_prefix, + filetype); else *filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s.%s", dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file, filetype); @@ -831,6 +835,16 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp, NULL, "bin"); return 0; } + } else if (asoc_component_prefix) { + if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, + cirrus_dir, NULL, + asoc_component_prefix, "wmfw")) { + adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename); + wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename, + cirrus_dir, NULL, + asoc_component_prefix, "bin"); + return 0; + } } if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename, -- 2.39.2

3 4

Re: [PATCH 3/4] ASoC: amd: acp: Add machine driver that enables sound for systems with a ES8336 codec
by Zhu Ning 29 Mar '23

29 Mar '23

> > The GPIO thing on Huawei Intel platform is too complicated, they use two GPIOs > > for headphone and speaker, and the headphone GPIO is inverted, which means low > > means on and high means off. Luckily there should be only one hardware config > > for the AMD acp3x platform GPIO and you may just choose the correct one. > > There being two different GPIOs sounds like it just allows the headphone > and speaker to be controlled separately - that seems more flexible, not > a problem? Yes it's called multi stream in Windows. However, extra GPIO causes more confusion in the driver. > > There is no such situation, and the system doesn't produce sound from speaker > > when headphones are plugged in. The user may manually open speaker using > > amixer sset 'Speaker' on or pavucontrol. > > Again, you're describing a specific configuration - someone might want > to do something different. Hi Marian Postevca you may want to separate the GPIO control by adding Headphone Power SND_SOC_DAPM_SUPPLY. You may also want to change the gpio handling function in the acp3x_es83xx_jack_events function. static const struct snd_soc_dapm_widget acp3x_es83xx_widgets[] = { SND_SOC_DAPM_SPK("Speaker", NULL), SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Internal Mic", NULL), + SND_SOC_DAPM_SUPPLY("Headphone Power", SND_SOC_NOPM, 0, 0, + acp3x_es83xx_headphone_power_event, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), SND_SOC_DAPM_SUPPLY("Speaker Power", SND_SOC_NOPM, 0, 0, acp3x_es83xx_speaker_power_event, SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), }; static const struct snd_soc_dapm_route acp3x_es83xx_audio_map[] = { {"Headphone", NULL, "HPOL"}, {"Headphone", NULL, "HPOR"}, + {"Headphone", NULL, "Headphone Power"}, {"Speaker", NULL, "HPOL"}, {"Speaker", NULL, "HPOR"}, {"Speaker", NULL, "Speaker Power"}, }; +static int acp3x_es83xx_headphone_power_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card); + + dev_dbg(priv->codec_dev, "speaker power event: %d\n", event); + if (SND_SOC_DAPM_EVENT_ON(event)) + gpiod_set_value_cansleep(priv->gpio_headphone, true); + else + gpiod_set_value_cansleep(priv->gpio_headphone, false); + + return 0; +} + +static int acp3x_es83xx_speaker_power_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct acp3x_es83xx_private *priv = get_mach_priv(w->dapm->card); + + dev_dbg(priv->codec_dev, "speaker power event: %d\n", event); + if (SND_SOC_DAPM_EVENT_ON(event)) + gpiod_set_value_cansleep(priv->gpio_speakers, true); + else + gpiod_set_value_cansleep(priv->gpio_speakers, false); + + return 0; +}

2 1

[PATCH] ALSA: hda/realtek: Add quirk for Lenovo ZhaoYang CF4620Z
by huangwenhui 29 Mar '23

29 Mar '23

Fix headset microphone detection on Lenovo ZhaoYang CF4620Z. Signed-off-by: huangwenhui <huangwenhuia(a)uniontech.com> Change-Id: I89d3f4d1d18193418f74d0095b0e4daaf24c839f --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index e8b7f6bbfc59..a8810231a5b5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7137,6 +7137,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), + SND_PCI_QUIRK(0x17aa, 0x9e56, "Lenovo ZhaoYang CF4620Z", ALC286_FIXUP_SONY_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MBXP", ALC256_FIXUP_HUAWEI_MBXP_PINS), SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */ -- 2.20.1

2 1

[PATCH] ALSA: remove unused loop_count variable
by Tom Rix 29 Mar '23

29 Mar '23

clang with W=1 reports sound/pci/asihpi/hpi6000.c:1256:6: error: variable 'loop_count' set but not used [-Werror,-Wunused-but-set-variable] u32 loop_count = 0; ^ This variable is not used so remove it. Signed-off-by: Tom Rix <trix(a)redhat.com> --- sound/pci/asihpi/hpi6000.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c index 88d902997b74..72aa135d69f8 100644 --- a/sound/pci/asihpi/hpi6000.c +++ b/sound/pci/asihpi/hpi6000.c @@ -1253,7 +1253,6 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao, int local_count = count; int xfer_size; u32 *pdata = dest; - u32 loop_count = 0; while (local_count) { if (local_count > c6711_burst_size) @@ -1273,7 +1272,6 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao, pdata += xfer_size; local_hpi_address += sizeof(u32) * xfer_size; local_count -= xfer_size; - loop_count++; } if (time_out) -- 2.27.0

2 1

ALC1220 DualCodec - changing to headphone (front panel) port doesn't work without toggling pro audio profile
by GitHub issues - edited 29 Mar '23

29 Mar '23

alsa-project/alsa-ucm-conf issue #299 was edited from metronidazole: I have a Gigabyte x570 aorus pro motherboard with the ALC1220 audio device using the dualcodec model. I have two issues: A. jack sense doesnt work. I'm not sure if this is a UCM thing, but in my desktop environment (KDE Plasma 5.27) the headphones port shows as "unplugged" in system settings, and hdajacksensetest shows it as not detected "Pin 0x1b (Green Headphone, Front side): present = No". this is a minor issue B. more importantly, when i want to use my frontpanel headphones input, i have to do the following work around otherwise no sound comes out: 1. Start with Profile set to 'analog stereo output' and port 'line out' 2. Plug in headphones and set port to 'headphones (unplugged)' -> sound stops from speakers (rear line out port) and there is no output from the headphoens 3. Set profile to pro audio -> audio comes through headphones (front port). **to return back to speakers (rear out)** 4. Set profile to analog stereo output) and change the port to 'headphones (unplugged)' and then back to 'line out' -> sound comes out of speakers I have attached some debug info below: [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/11099085… [alsaucm.txt](https://github.com/alsa-project/alsa-ucm-conf/files/11099087/a… Any help would be appreciated Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/299 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ALC1220 DualCodec - changing to headphone (front panel) port doesn't work without toggling pro audio profile
by GitHub issues - opened 29 Mar '23

29 Mar '23

alsa-project/alsa-ucm-conf issue #299 was opened from metronidazole: I have a Gigabyte x570 aorus pro motherboard with the ALC1220 audio device using the dualcodec model. I have two issues: A. jack sense doesnt work. I'm not sure if this is a UCM thing, but in my desktop environment (KDE Plasma 5.27) the headphones port shows as "unplugged" in system settings, and hdajacksensetest shows it as not detected "Pin 0x1b (Green Headphone, Front side): present = No". this is a minor issue B. more importantly, when i want to use my frontpanel headphones input, i have to do the following work around otherwise no sound comes out: 1. Start with Profile set to 'analog stereo output' and port 'line out' 2. Plug in headphones and set port to 'headphones (unplugged)' -> sound stops from speakers (rear line out port) and there is no output from the headphoens 3. Set profile to pro audio -> audio comes through headphones (front port). 4. Optionally, i can set the profile back to analog stero output and sound continues to come out through headphones (the port is however set to the default of 'line out') **to return back to speakers (rear out)** 5. While keeping the profile the same (as analog stereo output), i change port to 'headphones (unplugged)' and then change it back to 'line out' -> sound comes out of speakers I have attached some debug info below: [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/11099085… [alsaucm.txt](https://github.com/alsa-project/alsa-ucm-conf/files/11099087/a… Any help would be appreciated Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/299 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ALSA: ymfpci: Use register macro in place of integer literal
by Tasos Sahanidis 29 Mar '23

29 Mar '23

The macro for said register already exists, so just use it, to make the code more readable. Signed-off-by: Tasos Sahanidis <tasos(a)tasossah.com> --- sound/pci/ymfpci/ymfpci_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 2858736ed..24378f6fd 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -2214,7 +2214,7 @@ static void snd_ymfpci_free(struct snd_card *card) snd_ymfpci_free_gameport(chip); - pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl); + pci_write_config_word(chip->pci, PCIR_DSXG_LEGACY, chip->old_legacy_ctrl); release_firmware(chip->dsp_microcode); release_firmware(chip->controller_microcode); -- 2.25.1

2 1

[PATCH] ALSA: ymfpci: Use u16 consistently for old_legacy_ctrl
by Tasos Sahanidis 29 Mar '23

29 Mar '23

There's no need to switch between unsigned short and u16, especially since all the functions that end up using old_legacy_ctrl specify u16 anyway. Signed-off-by: Tasos Sahanidis <tasos(a)tasossah.com> --- sound/pci/ymfpci/ymfpci.h | 4 ++-- sound/pci/ymfpci/ymfpci_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h index 669687764..d11f9bf5a 100644 --- a/sound/pci/ymfpci/ymfpci.h +++ b/sound/pci/ymfpci/ymfpci.h @@ -276,7 +276,7 @@ struct snd_ymfpci { unsigned long reg_area_phys; void __iomem *reg_area_virt; - unsigned short old_legacy_ctrl; + u16 old_legacy_ctrl; #ifdef SUPPORT_JOYSTICK struct gameport *gameport; #endif @@ -355,7 +355,7 @@ struct snd_ymfpci { int snd_ymfpci_create(struct snd_card *card, struct pci_dev *pci, - unsigned short old_legacy_ctrl); + u16 old_legacy_ctrl); void snd_ymfpci_free_gameport(struct snd_ymfpci *chip); extern const struct dev_pm_ops snd_ymfpci_pm; diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 2858736ed..d44ecd916 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -2309,7 +2309,7 @@ SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume); int snd_ymfpci_create(struct snd_card *card, struct pci_dev *pci, - unsigned short old_legacy_ctrl) + u16 old_legacy_ctrl) { struct snd_ymfpci *chip = card->private_data; int err; -- 2.25.1

2 1

[PATCH 0/4] ALSA: ymfpci: PM related cleanups and fixes
by Tasos Sahanidis 29 Mar '23

29 Mar '23

Hi, This series started while attempting to fix the OPL not being detected after restoring from S4 on a YMF744. While attempting to debug the issue, it was found that SIMPLE_DEV_PM_OPS was deprecated, and thus replaced, and a few cleanups were made along the way. Tasos Sahanidis (4): ALSA: ymfpci: Switch to DEFINE_SIMPLE_DEV_PM_OPS() ALSA: ymfpci: Move allocation of saved registers to struct snd_ymfpci ALSA: ymfpci: Store saved legacy registers in an array ALSA: ymfpci: Store additional legacy registers on suspend sound/pci/ymfpci/ymfpci.c | 4 +- sound/pci/ymfpci/ymfpci.h | 50 +++++++++++++++++++++--- sound/pci/ymfpci/ymfpci_main.c | 70 ++++++++++------------------------ 3 files changed, 66 insertions(+), 58 deletions(-) -- 2.25.1

2 5

[PATCH] ALSA: ymfpci: Add error messages for abritrary IO ports on older chips
by Tasos Sahanidis 29 Mar '23

29 Mar '23

As an end user, it can be confusing to request an arbitrary IO port be used only to find out that it doesn't work without an obvious reason, especially since /sys/module/snd_ymfpci/parameters/{fm,joystick,mpu}_port indicate 0 after the module has been loaded. In my case, I was unaware that the YMF724 did not support such usage, and thus ended up spending time attempting to debug the issue. Now, when a user attempts to request an IO port that isn't supported by the hardware, the following message is printed: [ 25.549530] snd_ymfpci 0000:06:05.0: The Yamaha DS-1 (YMF724F) does not support arbitrary IO ports for FM (requested 0x1234) Signed-off-by: Tasos Sahanidis <tasos(a)tasossah.com> --- sound/pci/ymfpci/ymfpci.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 1e198e4d5..de5dc5337 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c @@ -98,8 +98,10 @@ static int snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev, case 0x204: legacy_ctrl2 |= 2 << 6; break; case 0x205: legacy_ctrl2 |= 3 << 6; break; default: - dev_err(chip->card->dev, - "invalid joystick port %#x", io_port); + if (io_port > 0) + dev_err(chip->card->dev, + "The %s does not support arbitrary IO ports for the game port (requested 0x%x)\n", + chip->card->shortname, (unsigned int)io_port); return -EINVAL; } } @@ -186,6 +188,13 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, default: model = str = "???"; break; } + strcpy(card->driver, str); + sprintf(card->shortname, "Yamaha %s (%s)", model, str); + sprintf(card->longname, "%s at 0x%lx, irq %i", + card->shortname, + chip->reg_area_phys, + chip->irq); + legacy_ctrl = 0; legacy_ctrl2 = 0x0800; /* SBEN = 0, SMOD = 01, LAD = 0 */ @@ -218,7 +227,13 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, case 0x398: legacy_ctrl2 |= 1; break; case 0x3a0: legacy_ctrl2 |= 2; break; case 0x3a8: legacy_ctrl2 |= 3; break; - default: fm_port[dev] = 0; break; + default: + if (fm_port[dev] > 0) + dev_err(card->dev, + "The %s does not support arbitrary IO ports for FM (requested 0x%x)\n", + card->shortname, (unsigned int)fm_port[dev]); + fm_port[dev] = 0; + break; } if (fm_port[dev] > 0) fm_res = devm_request_region(&pci->dev, fm_port[dev], @@ -234,7 +249,13 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, case 0x300: legacy_ctrl2 |= 1 << 4; break; case 0x332: legacy_ctrl2 |= 2 << 4; break; case 0x334: legacy_ctrl2 |= 3 << 4; break; - default: mpu_port[dev] = 0; break; + default: + if (mpu_port[dev] > 0) + dev_err(card->dev, + "The %s does not support arbitrary IO ports for MPU-401 (requested 0x%x)\n", + card->shortname, (unsigned int)mpu_port[dev]); + mpu_port[dev] = 0; + break; } if (mpu_port[dev] > 0) mpu_res = devm_request_region(&pci->dev, mpu_port[dev], @@ -257,12 +278,6 @@ static int snd_card_ymfpci_probe(struct pci_dev *pci, if (err < 0) return err; - strcpy(card->driver, str); - sprintf(card->shortname, "Yamaha %s (%s)", model, str); - sprintf(card->longname, "%s at 0x%lx, irq %i", - card->shortname, - chip->reg_area_phys, - chip->irq); err = snd_ymfpci_pcm(chip, 0); if (err < 0) return err; -- 2.25.1

2 1