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

Add OSS sequencer support
by GitHub pull_request - opened 09 Sep '26

09 Sep '26

alsa-project/alsa-oss pull request #4 was opened from tiwai: Add the support for OSS sequencer API emulation. Mostly aligned with the kernel code in sound/core/seq/oss, translating the event handling for ALSA sequencer API. Lightly tested with playmidi program (that is the only application I know of with OSS sequencer API). Request URL : https://github.com/alsa-project/alsa-oss/pull/4 Patch URL : https://github.com/alsa-project/alsa-oss/pull/4.patch Repository URL: https://github.com/alsa-project/alsa-oss

1 0

[GIT PULL] ASoC fixes for v7.3-rc2
by Mark Brown 09 Sep '26

09 Sep '26

The following changes since commit cee9395acd8043be0644b25c34bfa86623f2b935: Linux 7.3-rc1 (2026-08-30 13:34:40 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v7.3-rc2 for you to fetch changes up to 7e125889f1705fc6326679a3db3b4159f7a8c87e: ASoC: amd: acp-da7219-max98357a: don't bind on Raven/Picasso boards (2026-09-08 15:59:06 +0100) ---------------------------------------------------------------- ASoC: Fixes for v7.3 An unusually large batch of fixes here, partly due to me not sending a pull request last week and partly due to Linus' fixes for the Ericsson systems. I'm fairly sure he's the only user there so it seemed low risk to handle as fixes. We also have a batch of error handling fixes from Cezary and issues with uninitialised stream_config->type from Shuming both of which had user error reports attached. Otherwise everything is a fairly normal combination of quirks and device specific fixes. ---------------------------------------------------------------- Aaron Welwood (1): ASoC: amd: yc: add quirk for Acer Nitro AN17-41 internal mic Antoine Monnet (1): ASoC: tas2783-sdw: split a stereo stream across the two mono amps Cezary Rojewski (10): ALSA: hda: ext: Clean up links if their initialization fails ALSA: hda: ext: Clean up streams if their initialization fails ASoC: Intel: avs: Clean up the bus when its initialization fails ASoC: Intel: avs: Clean up the bus when fetching ML caps fails ASoC: Intel: avs: Clean up streams if their initialization fails ASoC: Intel: avs: Do not ignore -ENOENT when loading a topology ASoC: Intel: avs: Cancel d0ix_work asynchrounously during recovery ASoC: Intel: avs: Fix unbalanced module reference count ASoC: Intel: avs: Refactor and fix init_config access ASoC: Intel: avs: hda: Constrain MSBs on startup Jack Yu (1): ASoC: rt721-sdca: Adjust latency control to fix no-sound issue Jairaj Arava (1): ASoC: Intel: sof_rt5682: Add support for nvl_max98360a_rt5682 Linus Walleij (15): ASoC: ab8500: Reset the audio block before configuring it ASoC: ab8500: Repair the DAPM capture graph ASoC: ab8500: Correct digital interface format setup ASoC: ab8500: Validate and program TDM slots correctly ASoC: ab8500: Remove the nonfunctional sidetone apply control ASoC: ab8500: Skip missing DMIC GPIOs on AB8505 ASoC: ux500: Fix MSP stream lifecycle handling ASoC: ux500: Propagate MSP setup errors ASoC: ux500: Correct MSP frame and bit clock setup ASoC: ux500: Validate MSP DAI configuration ASoC: ux500: Deassert the MSP reset during probe ASoC: ux500: Request the MSP MMIO resource ASoC: ux500: Remove obsolete PRCMU QoS calls ASoC: ux500: Allow repeated MSP prepare calls ASoC: ux500: Program the MSP FIFO watermarks Mark Brown (3): ASoC: ab8500: Fix codec reset, routing and DAI setup ASoC: ux500: Fix MSP lifecycle, clocking and resources ALSA/ASoC: Intel: avs: HDAudio bus and general fixes Niranjan H Y (1): ASoC: Intel: sof_sdw: add tac5xx2-sdw family Richard Fitzgerald (3): ASoC: cs35l56: Fix pm_runtime imbalance if suspending before first attach ASoC: cs35l56: Fix probe deadlock waiting for SoundWire enumeration ASoC: cs35l56: Fix race between kexec and snd_soc_register_component() Runyu Xiao (1): ASoC: sti: initialize IRQ lock before requesting IRQ Shuming Fan (6): ASoC: rt766: fix uninitialized stream_config->type ASoC: rt712: fix uninitialized stream_config->type ASoC: rt1320: fix uninitialized stream_config->type ASoC: rt1318: fix uninitialized stream_config->type ASoC: rt721: fix uninitialized stream_config->type ASoC: rt722: fix uninitialized stream_config->type Syed Saba Kareem (1): ASoC: amd: yc: Add DMI entry for HP 255R G10 laptop Tianchu Chen (1): ASoC: sprd: validate compress buffer sizes against fixed allocations Yorick Rommers (1): ASoC: amd: acp-da7219-max98357a: don't bind on Raven/Picasso boards Zhang Yi (2): ASoC: codecs: ES8326: issue about capture pop ASoC: codecs: ES8389: Prevent enable_count underflow in clk_core_disable hpp.iscas (3): ASoC: bcm: bcm63xx: Publish the OF module aliases ASoC: Intel: SST: Publish the PCI module aliases ASoC: mt6351: Publish the OF module alias wangdicheng (2): ASoC: amd: renoir: fix disable_pdm_interrupts() to clear mask bits ASoC: amd: yc: fix memory leak in acp6x_pdm_dma_close() Ștefan Ghețu (1): ASoC: fsl_micfil: balance mclk enable/disable sound/hda/core/ext/controller.c | 4 +- sound/hda/core/ext/stream.c | 5 +- sound/soc/amd/acp-da7219-max98357a.c | 23 + sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- sound/soc/amd/yc/acp6x-mach.c | 14 + sound/soc/amd/yc/acp6x-pdm-dma.c | 2 + sound/soc/bcm/bcm63xx-i2s-whistler.c | 1 + sound/soc/codecs/ab8500-codec.c | 682 +++++++++------------- sound/soc/codecs/cs35l56-sdw.c | 7 +- sound/soc/codecs/cs35l56.c | 116 +++- sound/soc/codecs/cs35l56.h | 2 + sound/soc/codecs/es8326.c | 19 +- sound/soc/codecs/es8389.c | 34 +- sound/soc/codecs/mt6351.c | 1 + sound/soc/codecs/rt1318-sdw.c | 24 +- sound/soc/codecs/rt1320-sdw.c | 2 +- sound/soc/codecs/rt712-sdca.c | 17 +- sound/soc/codecs/rt721-sdca.c | 17 +- sound/soc/codecs/rt722-sdca.c | 16 +- sound/soc/codecs/rt766-sdca.c | 5 +- sound/soc/codecs/tas2783-sdw.c | 25 + sound/soc/fsl/fsl_micfil.c | 21 +- sound/soc/intel/atom/sst/sst_pci.c | 1 + sound/soc/intel/avs/boards/hdaudio.c | 17 + sound/soc/intel/avs/core.c | 59 +- sound/soc/intel/avs/debugfs.c | 12 +- sound/soc/intel/avs/ipc.c | 6 +- sound/soc/intel/avs/path.c | 11 +- sound/soc/intel/avs/pcm.c | 34 +- sound/soc/intel/avs/topology.c | 49 +- sound/soc/intel/avs/topology.h | 5 +- sound/soc/intel/boards/Kconfig | 4 +- sound/soc/intel/boards/sof_rt5682.c | 8 + sound/soc/intel/common/soc-acpi-intel-nvl-match.c | 8 +- sound/soc/sprd/sprd-pcm-compress.c | 15 +- sound/soc/sti/uniperif_reader.c | 4 +- sound/soc/ux500/ux500_msp_dai.c | 189 +++--- sound/soc/ux500/ux500_msp_dai.h | 14 +- sound/soc/ux500/ux500_msp_i2s.c | 264 ++++++--- sound/soc/ux500/ux500_msp_i2s.h | 12 +- 40 files changed, 955 insertions(+), 796 deletions(-)

2 1

[PATCH] ASoC: wm8962: Do not clear SYSCLK_ENA owned by DAPM in configure_bclk()
by Maxime Douailin 09 Sep '26

09 Sep '26

wm8962_configure_bclk() provisionally sets SYSCLK_ENA so that the read-only DSPCLK_DIV field becomes valid, then clears it again whenever the bias level is below SND_SOC_BIAS_ON. It never checks whether the bit was already set. It can be: the "SYSCLK" DAPM supply widget owns that bit, and wm8962_mic_detect() force-enables the pin. On boards that call it (the Tegra machine driver, i.e. Microsoft Surface RT and Surface 2) DAPM sets SYSCLK_ENA once at card init and, because the widget then never changes power state, never writes it again. The first stream's transition to SND_SOC_BIAS_PREPARE runs configure_bclk(), which clears the bit behind DAPM's back. From then on every stream plays with SYSCLK off: the DACs do not run, CP_ENA refuses to latch, hp_event() reports "DC servo timed out", and the codec is silent although every register DAPM believes in looks right. Remember whether SYSCLK_ENA was set on entry and only undo our own provisional enable. The bug was located with the help of an LLM coding assistant, by diffing the driver's regmap cache against raw I2C reads of the chip during playback; the assistant also drafted this patch and the changelog. The analysis was confirmed, and the fix written and tested, on real hardware. Verified on a Microsoft Surface 2 (Tegra 4, WM8962 rev F): with the bit forced on over I2C during a stream the DC servo completes in ~56 ms and audio is heard; with this patch applied the DC servo completes on every stream and there is no more "DC servo timed out". Fixes: 75704ecfbb41 ("ASoC: wm8962: Enable SYSCLK provisonally before fetching generated DSPCLK_DIV") Cc: stable(a)vger.kernel.org Assisted-by: LLM Signed-off-by: Maxime Douailin <maxime.douailin(a)gmail.com> --- Notes: - Found and verified on a Microsoft Surface 2 (Tegra 4); the same silence is reported on Microsoft Surface RT, whose machine driver is the same. Background and the full register-level analysis (regmap cache vs. raw I2C reads during playback): https://github.com/grate-driver/linux/issues/141 - Boards that do not call wm8962_mic_detect() are unaffected: there SYSCLK_ENA is never already set below SND_SOC_BIAS_ON, sysclk_was_ena is false, and the sequence is bit-identical to the current one. - The deeper question is whether tegra_wm8962 should be calling wm8962_mic_detect() at all on these boards, but the codec should not be clearing a bit DAPM owns regardless, so this fix stands on its own. - Tooling, per Documentation/process/generated-content.rst: an LLM coding assistant did the register-diff analysis that found the bug and drafted this patch and changelog, over an interactive session on the affected hardware rather than from a single prompt. Every register claim above was checked against the chip over I2C, and the fix was built and listened to on the machine before sending. I understand the change and stand behind it. sound/soc/codecs/wm8962.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index af471605122..c314af2c860 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2472,6 +2472,8 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) int clocking2 = 0; int clocking4 = 0; int aif2 = 0; + int sysclk; + bool sysclk_was_ena; if (!wm8962->sysclk_rate) { dev_dbg(component->dev, "No SYSCLK configured\n"); @@ -2504,8 +2506,19 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) /* DSPCLK_DIV can be only generated correctly after enabling SYSCLK. * So we here provisionally enable it and then disable it afterward * if current bias_level hasn't reached SND_SOC_BIAS_ON. + * + * SYSCLK_ENA is owned by the "SYSCLK" DAPM supply widget, which may + * already have it set even below SND_SOC_BIAS_ON: wm8962_mic_detect() + * force-enables that pin, so on boards using it (the Tegra machine + * driver) the bit is set once at card init and DAPM never writes it + * again. If we unconditionally clear it here, SYSCLK stays off for + * every stream, DAPM still believes it is on, and the codec is + * silent with "DC servo timed out" errors. Only undo what we did. */ - if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) + sysclk = snd_soc_component_read(component, WM8962_CLOCKING2); + sysclk_was_ena = sysclk >= 0 && (sysclk & WM8962_SYSCLK_ENA); + if (!sysclk_was_ena && + snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, WM8962_SYSCLK_ENA); @@ -2519,7 +2532,8 @@ static void wm8962_configure_bclk(struct snd_soc_component *component) usleep_range(500, 1000); dspclk = snd_soc_component_read(component, WM8962_CLOCKING1); - if (snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) + if (!sysclk_was_ena && + snd_soc_dapm_get_bias_level(dapm) != SND_SOC_BIAS_ON) snd_soc_component_update_bits(component, WM8962_CLOCKING2, WM8962_SYSCLK_ENA_MASK, 0); base-commit: 0e2bf66c2f6326c0626c9db22530954ef5c64b08 -- 2.53.0

2 1

[PATCH v2] ASoC: rt712-sdca: reconfigure PLL2 to fix calibration time-out
by jack.yu＠realtek.com 09 Sep '26

09 Sep '26

From: Jack Yu <jack.yu(a)realtek.com> Add pll2 reconfiguration sequence in order to fix calibration time-out issue and to support 24.576MHz MCLK on specific platforms. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt712-sdca-sdw.c | 8 +++ sound/soc/codecs/rt712-sdca.c | 86 +++++++++++++++++++++++++++++-- sound/soc/codecs/rt712-sdca.h | 18 +++++++ 3 files changed, 109 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c index c50e74e20a88..edba0367d9ce 100644 --- a/sound/soc/codecs/rt712-sdca-sdw.c +++ b/sound/soc/codecs/rt712-sdca-sdw.c @@ -18,12 +18,16 @@ static bool rt712_sdca_readable_register(struct device *dev, unsigned int reg) { switch (reg) { + case 0x004d: case 0x201a ... 0x201f: case 0x2029 ... 0x202a: case 0x202d ... 0x2034: case 0x2230 ... 0x2232: case 0x2f01 ... 0x2f0a: case 0x2f35 ... 0x2f36: + case 0x2f3a: + case 0x2f3d: + case 0x2f41: case 0x2f50: case 0x2f54: case 0x2f58 ... 0x2f5d: @@ -48,6 +52,7 @@ static bool rt712_sdca_readable_register(struct device *dev, unsigned int reg) static bool rt712_sdca_volatile_register(struct device *dev, unsigned int reg) { switch (reg) { + case 0x004d: case 0x201b: case 0x201c: case 0x201d: @@ -56,6 +61,9 @@ static bool rt712_sdca_volatile_register(struct device *dev, unsigned int reg) case 0x2230: case 0x2f01: case 0x2f35: + case 0x2f3a: + case 0x2f3d: + case 0x2f41: case 0x320c: case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_GE49, RT712_SDCA_CTL_DETECTED_MODE, 0): case SDW_SDCA_CTL(FUNC_NUM_HID, RT712_SDCA_ENT_HID01, RT712_SDCA_CTL_HIDTX_CURRENT_OWNER, 0) ... diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c index eda87eb9ab66..38052cb19790 100644 --- a/sound/soc/codecs/rt712-sdca.c +++ b/sound/soc/codecs/rt712-sdca.c @@ -73,14 +73,57 @@ static int rt712_sdca_index_update_bits(struct rt712_sdca_priv *rt712, return rt712_sdca_index_write(rt712, nid, reg, tmp); } +static void rt712_sdca_clk_patch(struct rt712_sdca_priv *rt712) +{ + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x02); + usleep_range(1000, 1100); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x0080, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x001f, 0x0017); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF3, 0x0010, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF1, 0x0081, 0x0001); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF1, 0x0081, 0x0081); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x0080, 0x0080); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x001f, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF3, 0x0010, 0x0010); + usleep_range(1000, 1100); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0081); +} + +static void rt712_sdca_clk_patch2(struct rt712_sdca_priv *rt712) +{ + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_REG, 0x49, 0x0800, + 0x0000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_REG, 0x49, 0xf000, + 0x0000); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_ANALOG_CTL, 0x0c, 0xc000, + 0xc000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_ANALOG_CTL, 0x00, 0xc000, + 0xc000); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0081); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x02); + usleep_range(1000, 1100); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); +} + static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) { unsigned int val, loop_rc = 0, loop_dc = 0; struct device *dev; struct regmap *regmap = rt712->regmap; + unsigned int clk_base; int chk_cnt = 100; int ret = 0; + regmap_read(rt712->regmap, RT712_SDW_ROOT_CLK, &clk_base); + mutex_lock(&rt712->calibrate_mutex); dev = regmap_get_device(regmap); @@ -109,8 +152,35 @@ static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) if (ret < 0) goto _cali_fail_; } - if (loop_dc == chk_cnt) - dev_err(dev, "%s, calibration time-out!\n", __func__); + + if (loop_dc == chk_cnt) { + if (clk_base == RT712_CLK_FREQ_24_576MHZ) { + rt712_sdca_clk_patch(rt712); + rt712_sdca_clk_patch2(rt712); + } + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_FSM_CTL, 0x4100); + rt712_sdca_index_write(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, 0x7883); + rt712_sdca_index_write(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, 0xf893); + rt712_sdca_index_read(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, &val); + + for (loop_dc = 0; loop_dc < chk_cnt && + (val & RT712_DAC_DC_CALI_TRIGGER); loop_dc++) { + usleep_range(10000, 11000); + ret = rt712_sdca_index_read(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, &val); + + if (ret < 0) + goto _cali_fail_; + } + + if (loop_dc == chk_cnt) + dev_err(dev, "%s, calibration time-out!\n", __func__); + else + dev_dbg(dev, "%s, calibration success!\n", __func__); + } if (loop_dc == chk_cnt || loop_rc == chk_cnt) ret = -ETIMEDOUT; @@ -1759,9 +1829,13 @@ static void rt712_sdca_va_io_init(struct rt712_sdca_priv *rt712) static void rt712_sdca_vb_io_init(struct rt712_sdca_priv *rt712) { - int ret = 0; unsigned int jack_func_status, mic_func_status, amp_func_status; struct device *dev = &rt712->slave->dev; + unsigned int clk_base; + int ret = 0; + + regmap_read(rt712->regmap, RT712_SDW_ROOT_CLK, &clk_base); + dev_dbg(dev, "%s clk_base=%x", __func__, clk_base); regmap_read(rt712->regmap, SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT0, RT712_SDCA_CTL_FUNC_STATUS, 0), &jack_func_status); @@ -1773,6 +1847,12 @@ static void rt712_sdca_vb_io_init(struct rt712_sdca_priv *rt712) __func__, jack_func_status, mic_func_status, amp_func_status); rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_JD_CTL3, 0x7778); + + if (clk_base == RT712_CLK_FREQ_24_576MHZ) { + rt712_sdca_clk_patch(rt712); + rt712_sdca_clk_patch2(rt712); + } + /* DMIC */ if ((mic_func_status & FUNCTION_NEEDS_INITIALIZATION) || (!rt712->first_hw_init)) { rt712_sdca_index_write(rt712, RT712_VENDOR_HDA_CTL, RT712_DMIC2_FU_IT_FLOAT_CTL, 0x1526); diff --git a/sound/soc/codecs/rt712-sdca.h b/sound/soc/codecs/rt712-sdca.h index 46740281a5c1..6229fe341bb5 100644 --- a/sound/soc/codecs/rt712-sdca.h +++ b/sound/soc/codecs/rt712-sdca.h @@ -162,6 +162,16 @@ struct rt712_dmic_kctrl_priv { #define RT712_EAPD_HIGH 0x2 #define RT712_EAPD_LOW 0x0 +/* SDW clock root frequency */ +#define RT712_SDW_ROOT_CLK 0x004d +#define RT712_SDW_SCALE_CLK0 0x0062 +#define RT712_SDW_SCALE_CLK1 0x0072 + +/* PLL2 config */ +#define RT712_PLL2_CONF1 0x2f3a +#define RT712_PLL2_CONF2 0x2f3d +#define RT712_PLL2_CONF3 0x2f41 + /* RC Calibration register */ #define RT712_RC_CAL 0x3201 @@ -254,6 +264,14 @@ enum rt712_sdca_version { RT712_VB, }; +enum { + RT712_CLK_FREQ_19_2_MHZ = 1, + RT712_CLK_FREQ_24MHZ = 2, + RT712_CLK_FREQ_24_576MHZ = 3, + RT712_CLK_FREQ_22_5792MHZ = 4, +}; + + int rt712_sdca_io_init(struct device *dev, struct sdw_slave *slave); int rt712_sdca_init(struct device *dev, struct regmap *regmap, struct regmap *mbq_regmap, struct sdw_slave *slave); -- 2.54.0

1 0

[PATCH v4 0/2] ASoC: codecs: nau8360: Fix DSP routing and deadlock issues
by Neo Chang 09 Sep '26

09 Sep '26

This patch series addresses two issues in the nau8360 codec driver regarding the DAC mux control: 1. An invalid hardware routing state that occurs when the DSP firmware fails to load but the userspace attempts to switch to the DSP path. 2. A pre-existing AB-BA deadlock triggered during concurrent stream startups or ALSA mixer updates. --- Changes in v4: - Patch 1/2: Changed the return value to -EBUSY instead of 0 to properly reject the invalid request and prevent ALSA state desync. - Patch 1/2: Used dev_warn_ratelimited() instead of dev_warn(). - Patch 2/2: Added a fix for the AB-BA deadlock in nau8360_dac_mux_put_enum(). (Reported by Sashiko AI) Changes in v3: - Block the DSP path selection if the firmware fails to load to prevent invalid routing states. Changes in v2: - Use snd_soc_component_update_bits() to prevent register overwriting. (Reported by Sashiko AI) - Fix missing bit shift for default PEQ band. (Reported by Sashiko AI) Neo Chang (2): ASoC: codecs: nau8360: Block DSP path selection when firmware load fails ASoC: codecs: nau8360: Fix AB-BA deadlock in mux update sound/soc/codecs/nau8360.c | 19 +++++++++++++------ sound/soc/codecs/nau8360.h | 6 ++++++ 2 files changed, 19 insertions(+), 6 deletions(-) -- 2.25.1

1 1

[PATCH v3] ASoC: codecs: nau8360: Block DSP path selection when firmware load fails
by Neo Chang 08 Sep '26

08 Sep '26

Block the DSP path selection if the firmware fails to load to prevent invalid routing states. If the firmware is not ready, nau8360_dac_mux_put_enum() will print a warning and return 0. This rejects the invalid userspace request and maintains the original hardware state without causing audio wrong status. Signed-off-by: Neo Chang <YLCHANG2(a)nuvoton.com> --- Changes in v3: - Abandoned the bypass fallback in nau8360_load_fw_work(). - Added check in nau8360_dac_mux_put_enum() to explicitly block DSP path selection and return 0 when firmware is not ready. Changes in v2: - Replaced snd_soc_component_write() with snd_soc_component_update_bits() in the fallback logic to prevent overwriting other bits. v1: - ASoC: codecs: nau8360: Set DAC path to bypass mode when DSP firmware load fails sound/soc/codecs/nau8360.c | 5 +++++ sound/soc/codecs/nau8360.h | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/sound/soc/codecs/nau8360.c b/sound/soc/codecs/nau8360.c index 89b8ee80d6c8..57a5023fe7b7 100644 --- a/sound/soc/codecs/nau8360.c +++ b/sound/soc/codecs/nau8360.c @@ -719,6 +719,11 @@ static int nau8360_dac_mux_put_enum(struct snd_kcontrol *kcontrol, return ret; } + if (item[0] == NAU8360_DAC_SRC_DSP && !nau8360->load_fw_done) { + dev_warn(nau8360->dev, "Cannot enable DSP: Firmware not ready or disabled\n"); + return ret; + } + mutex_lock(&nau8360->lock); ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol); diff --git a/sound/soc/codecs/nau8360.h b/sound/soc/codecs/nau8360.h index cc640ba8c838..71396747c0fa 100644 --- a/sound/soc/codecs/nau8360.h +++ b/sound/soc/codecs/nau8360.h @@ -870,6 +870,12 @@ enum { NAU8360_TDM_TXN, }; +/* DAC Source Path*/ +enum { + NAU8360_DAC_SRC_HW1 = 0, + NAU8360_DAC_SRC_DSP, +}; + /* PLL Source */ enum { NAU8360_PLL_MCLK, -- 2.25.1

2 1

[PATCH] ASoC: rt712-sdca: reconfigure PLL2 to fix calibration time-out
by jack.yu＠realtek.com 08 Sep '26

08 Sep '26

From: Jack Yu <jack.yu(a)realtek.com> Add pll2 reconfiguration sequence in order to fix calibration time-out issue and to support 24.576MHz MCLK on specific platforms. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt712-sdca-sdw.c | 8 +++ sound/soc/codecs/rt712-sdca.c | 88 +++++++++++++++++++++++++++++-- sound/soc/codecs/rt712-sdca.h | 18 +++++++ 3 files changed, 111 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c index c50e74e20a88..edba0367d9ce 100644 --- a/sound/soc/codecs/rt712-sdca-sdw.c +++ b/sound/soc/codecs/rt712-sdca-sdw.c @@ -18,12 +18,16 @@ static bool rt712_sdca_readable_register(struct device *dev, unsigned int reg) { switch (reg) { + case 0x004d: case 0x201a ... 0x201f: case 0x2029 ... 0x202a: case 0x202d ... 0x2034: case 0x2230 ... 0x2232: case 0x2f01 ... 0x2f0a: case 0x2f35 ... 0x2f36: + case 0x2f3a: + case 0x2f3d: + case 0x2f41: case 0x2f50: case 0x2f54: case 0x2f58 ... 0x2f5d: @@ -48,6 +52,7 @@ static bool rt712_sdca_readable_register(struct device *dev, unsigned int reg) static bool rt712_sdca_volatile_register(struct device *dev, unsigned int reg) { switch (reg) { + case 0x004d: case 0x201b: case 0x201c: case 0x201d: @@ -56,6 +61,9 @@ static bool rt712_sdca_volatile_register(struct device *dev, unsigned int reg) case 0x2230: case 0x2f01: case 0x2f35: + case 0x2f3a: + case 0x2f3d: + case 0x2f41: case 0x320c: case SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT_GE49, RT712_SDCA_CTL_DETECTED_MODE, 0): case SDW_SDCA_CTL(FUNC_NUM_HID, RT712_SDCA_ENT_HID01, RT712_SDCA_CTL_HIDTX_CURRENT_OWNER, 0) ... diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c index eda87eb9ab66..a18899649829 100644 --- a/sound/soc/codecs/rt712-sdca.c +++ b/sound/soc/codecs/rt712-sdca.c @@ -73,14 +73,59 @@ static int rt712_sdca_index_update_bits(struct rt712_sdca_priv *rt712, return rt712_sdca_index_write(rt712, nid, reg, tmp); } +static void rt712_sdca_clk_patch(struct rt712_sdca_priv *rt712) +{ + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x02); + usleep_range(1000, 1100); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x0080, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x001f, 0x0017); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF3, 0x0010, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF1, 0x0081, 0x0001); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF1, 0x0081, 0x0081); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x0080, 0x0080); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF2, 0x001f, 0x0000); + regmap_update_bits(rt712->regmap, RT712_PLL2_CONF3, 0x0010, 0x0010); + usleep_range(1000, 1100); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0081); +} + +static void rt712_sdca_clk_patch2(struct rt712_sdca_priv *rt712) +{ + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_REG, 0x49, 0x0800, + 0x0000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_REG, 0x49, 0xf000, + 0x0000); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_ANALOG_CTL, 0x0c, 0xc000, + 0xc000); + rt712_sdca_index_update_bits(rt712, RT712_VENDOR_ANALOG_CTL, 0x00, 0xc000, + 0xc000); + regmap_write(rt712->regmap, RT712_SDW_SCALE_CLK0, 0x03); + regmap_write(rt712->regmap, RT712_SDW_SCALE_CLK1, 0x03); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0081); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x02); + usleep_range(1000, 1100); + regmap_write(rt712->regmap, RT712_SDW_ROOT_CLK, 0x03); + usleep_range(1000, 1100); + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, 0x65, 0x0000); +} + static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) { unsigned int val, loop_rc = 0, loop_dc = 0; struct device *dev; struct regmap *regmap = rt712->regmap; + unsigned int clk_base; int chk_cnt = 100; int ret = 0; + regmap_read(rt712->regmap, RT712_SDW_ROOT_CLK, &clk_base); + mutex_lock(&rt712->calibrate_mutex); dev = regmap_get_device(regmap); @@ -109,8 +154,35 @@ static int rt712_sdca_calibration(struct rt712_sdca_priv *rt712) if (ret < 0) goto _cali_fail_; } - if (loop_dc == chk_cnt) - dev_err(dev, "%s, calibration time-out!\n", __func__); + + if (loop_dc == chk_cnt) { + if (clk_base == RT712_CLK_FREQ_24_576MHZ) { + rt712_sdca_clk_patch(rt712); + rt712_sdca_clk_patch2(rt712); + } + rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_FSM_CTL, 0x4100); + rt712_sdca_index_write(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, 0x7883); + rt712_sdca_index_write(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, 0xf893); + rt712_sdca_index_read(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, &val); + + for (loop_dc = 0; loop_dc < chk_cnt && + (val & RT712_DAC_DC_CALI_TRIGGER); loop_dc++) { + usleep_range(10000, 11000); + ret = rt712_sdca_index_read(rt712, RT712_VENDOR_CALI, + RT712_DAC_DC_CALI_CTL1, &val); + + if (ret < 0) + goto _cali_fail_; + } + + if (loop_dc == chk_cnt) + dev_err(dev, "%s, calibration time-out!\n", __func__); + else + dev_dbg(dev, "%s, calibration success!\n", __func__); + } if (loop_dc == chk_cnt || loop_rc == chk_cnt) ret = -ETIMEDOUT; @@ -1759,9 +1831,13 @@ static void rt712_sdca_va_io_init(struct rt712_sdca_priv *rt712) static void rt712_sdca_vb_io_init(struct rt712_sdca_priv *rt712) { - int ret = 0; unsigned int jack_func_status, mic_func_status, amp_func_status; struct device *dev = &rt712->slave->dev; + unsigned int clk_base; + int ret = 0; + + regmap_read(rt712->regmap, RT712_SDW_ROOT_CLK, &clk_base); + dev_dbg(dev, "%s clk_base=%x", __func__, clk_base); regmap_read(rt712->regmap, SDW_SDCA_CTL(FUNC_NUM_JACK_CODEC, RT712_SDCA_ENT0, RT712_SDCA_CTL_FUNC_STATUS, 0), &jack_func_status); @@ -1773,6 +1849,12 @@ static void rt712_sdca_vb_io_init(struct rt712_sdca_priv *rt712) __func__, jack_func_status, mic_func_status, amp_func_status); rt712_sdca_index_write(rt712, RT712_VENDOR_REG, RT712_JD_CTL3, 0x7778); + + if (clk_base == RT712_CLK_FREQ_24_576MHZ) { + rt712_sdca_clk_patch(rt712); + rt712_sdca_clk_patch2(rt712); + } + /* DMIC */ if ((mic_func_status & FUNCTION_NEEDS_INITIALIZATION) || (!rt712->first_hw_init)) { rt712_sdca_index_write(rt712, RT712_VENDOR_HDA_CTL, RT712_DMIC2_FU_IT_FLOAT_CTL, 0x1526); diff --git a/sound/soc/codecs/rt712-sdca.h b/sound/soc/codecs/rt712-sdca.h index 46740281a5c1..6229fe341bb5 100644 --- a/sound/soc/codecs/rt712-sdca.h +++ b/sound/soc/codecs/rt712-sdca.h @@ -162,6 +162,16 @@ struct rt712_dmic_kctrl_priv { #define RT712_EAPD_HIGH 0x2 #define RT712_EAPD_LOW 0x0 +/* SDW clock root frequency */ +#define RT712_SDW_ROOT_CLK 0x004d +#define RT712_SDW_SCALE_CLK0 0x0062 +#define RT712_SDW_SCALE_CLK1 0x0072 + +/* PLL2 config */ +#define RT712_PLL2_CONF1 0x2f3a +#define RT712_PLL2_CONF2 0x2f3d +#define RT712_PLL2_CONF3 0x2f41 + /* RC Calibration register */ #define RT712_RC_CAL 0x3201 @@ -254,6 +264,14 @@ enum rt712_sdca_version { RT712_VB, }; +enum { + RT712_CLK_FREQ_19_2_MHZ = 1, + RT712_CLK_FREQ_24MHZ = 2, + RT712_CLK_FREQ_24_576MHZ = 3, + RT712_CLK_FREQ_22_5792MHZ = 4, +}; + + int rt712_sdca_io_init(struct device *dev, struct sdw_slave *slave); int rt712_sdca_init(struct device *dev, struct regmap *regmap, struct regmap *mbq_regmap, struct sdw_slave *slave); -- 2.54.0

3 2

[PATCH 6.1.y] ALSA: seq: Fix port lock leak in deliver_to_subscribers()
by Tzung-Bi Shih 08 Sep '26

08 Sep '26

Commit 46397622a3fa ("ALSA: seq: Add UMP support") mistakenly removed the `snd_seq_port_unlock(src_port)` call in deliver_to_subscribers(). As a result, every time an event is delivered to a subscriber, the source port's `use_lock` atomic counter is increased but never decreased. The leak prevents ALSA sequencer ports from closing cleanly. When the client process exits or destroys the port, port_delete() hangs forever at snd_use_lock_sync(). The process becomes stuck in an unkillable D state, triggering the following warning: ALSA: seq_lock: waiting [1 left] in sound/core/seq/seq_ports.c:250 Restore the missing `snd_seq_port_unlock(src_port)`. Note that commit 177ccf811df4 ("ALSA: seq: Support MIDI 2.0 UMP Endpoint port") incidentally resolved this issue upstream when it refactored the locking logic into a wrapper function. However, since the commit introduces a new feature and might not be suitable for stable release branches, this targeted fix is necessary. Fixes: d7e2ce72833b ("ALSA: seq: Add UMP support") Signed-off-by: Tzung-Bi Shih <tzungbi(a)kernel.org> --- sound/core/seq/seq_clientmgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 9b82fccd959c..37930d74e394 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -733,6 +733,7 @@ static int deliver_to_subscribers(struct snd_seq_client *client, read_unlock(&grp->list_lock); else up_read(&grp->list_mutex); + snd_seq_port_unlock(src_port); memcpy(event, &event_saved, saved_size); return (result < 0) ? result : num_ev; } -- 2.55.0.979.g7e5102b832-goog

3 3

[PATCH 5.15.y] ALSA: seq: Fix port lock leak in deliver_to_subscribers()
by Tzung-Bi Shih 08 Sep '26

08 Sep '26

Commit 46397622a3fa ("ALSA: seq: Add UMP support") mistakenly removed the `snd_seq_port_unlock(src_port)` call in deliver_to_subscribers(). As a result, every time an event is delivered to a subscriber, the source port's `use_lock` atomic counter is increased but never decreased. The leak prevents ALSA sequencer ports from closing cleanly. When the client process exits or destroys the port, port_delete() hangs forever at snd_use_lock_sync(). The process becomes stuck in an unkillable D state, triggering the following warning: ALSA: seq_lock: waiting [1 left] in sound/core/seq/seq_ports.c:250 Restore the missing `snd_seq_port_unlock(src_port)`. Note that commit 177ccf811df4 ("ALSA: seq: Support MIDI 2.0 UMP Endpoint port") incidentally resolved this issue upstream when it refactored the locking logic into a wrapper function. However, since the commit introduces a new feature and might not be suitable for stable release branches, this targeted fix is necessary. Fixes: 6389f2c13531 ("ALSA: seq: Add UMP support") Signed-off-by: Tzung-Bi Shih <tzungbi(a)kernel.org> --- sound/core/seq/seq_clientmgr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index f2feeb97765c..bd2d7a9fab5b 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -733,6 +733,7 @@ static int deliver_to_subscribers(struct snd_seq_client *client, read_unlock(&grp->list_lock); else up_read(&grp->list_mutex); + snd_seq_port_unlock(src_port); memcpy(event, &event_saved, saved_size); return (result < 0) ? result : num_ev; } -- 2.55.0.979.g7e5102b832-goog

3 3

[PATCH] ASoC: amd: yc: add quirk for Acer Nitro AN17-41 internal mic
by Aaron Welwood 07 Sep '26

07 Sep '26

The Acer Nitro AN17-41 uses "RB" as its board vendor and has no entry in yc_acp_quirk_table, so acp6x_probe() finds no DMI match, registers no card, and the internal digital microphone records only silence. Add a quirk entry for it so the DMIC is enabled. Signed-off-by: Aaron Welwood <abwelwood(a)gmail.com> --- Tested on an Acer Nitro AN17-41 (board Spacia_PEH, BIOS V1.26). Without this entry acp6x_probe() returns -ENODEV and the internal DMIC records silence; with it the acp6x card registers and the microphone captures normally. sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 21d7ec0..65c4d13 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -388,6 +388,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Nitro ANV15-41"), } }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "RB"), + DMI_MATCH(DMI_PRODUCT_NAME, "Nitro AN17-41"), + } + }, { .driver_data = &acp6x_card, .matches = { -- 2.55.0

1 0