From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
lgirdwood@gmail.com, linux-sound@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 13/39] ASoC: soc-dapm: set bias_level if snd_soc_dapm_set_bias_level() was successed
Date: Sun, 3 Aug 2025 20:40:15 -0400 [thread overview]
Message-ID: <20250804004041.3628812-13-sashal@kernel.org> (raw)
In-Reply-To: <20250804004041.3628812-1-sashal@kernel.org>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[ Upstream commit f40ecc2743652c0b0f19935f81baf57c601eb7f0 ]
ASoC has 2 functions to set bias level.
(A) snd_soc_dapm_force_bias_level()
(B) snd_soc_dapm_set_bias_level()
snd_soc_dapm_force_bias_level() (A) will set dapm->bias_level (a) if
successed.
(A) int snd_soc_dapm_force_bias_level(...)
{
...
if (ret == 0)
(a) dapm->bias_level = level;
...
}
snd_soc_dapm_set_bias_level() (B) is also a function that sets bias_level.
It will call snd_soc_dapm_force_bias_level() (A) inside, but doesn't
set dapm->bias_level by itself. One note is that (A) might not be called.
(B) static int snd_soc_dapm_set_bias_level(...)
{
...
ret = snd_soc_card_set_bias_level(...);
...
if (dapm != &card->dapm)
(A) ret = snd_soc_dapm_force_bias_level(...);
...
ret = snd_soc_card_set_bias_level_post(...);
...
}
dapm->bias_level will be set if (A) was called, but might not be set
if (B) was called, even though it calles set_bias_level() function.
We should set dapm->bias_level if we calls
snd_soc_dapm_set_bias_level() (B), too.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87qzyn4g4h.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
LLM Generated explanations, may be completely bogus:
Based on my analysis, here's my assessment:
**Backport Status: YES**
This commit should be backported to stable kernel trees for the
following reasons:
1. **Bug Fix**: This is a clear bug fix that addresses an inconsistency
in bias level management. The commit message clearly explains that
`snd_soc_dapm_set_bias_level()` doesn't always update
`dapm->bias_level`, particularly when dealing with card-level DAPM
contexts where `snd_soc_dapm_force_bias_level()` is not called.
2. **Small and Contained**: The fix is minimal - it only adds 4 lines of
code:
```c
/* success */
if (ret == 0)
snd_soc_dapm_init_bias_level(dapm, level);
```
This ensures that `dapm->bias_level` is always updated when the bias
level change succeeds.
3. **Important Correctness Issue**: The inconsistency could lead to
incorrect bias level tracking, which affects power management
decisions in the ASoC subsystem. Code that checks `dapm->bias_level`
(as shown in lines like `if (dapm->bias_level == SND_SOC_BIAS_ON)`)
may make wrong decisions if the bias level isn't properly tracked.
4. **No Architectural Changes**: This is a straightforward fix that
doesn't introduce new features or change the architecture. It simply
ensures consistent behavior between the two bias level setting
functions.
5. **Low Risk**: The change only affects the success path (when `ret ==
0`) and uses an existing inline function
`snd_soc_dapm_init_bias_level()` that simply sets `dapm->bias_level =
level`. This is the same operation that
`snd_soc_dapm_force_bias_level()` performs on success.
6. **Affects User-Facing Functionality**: Incorrect bias level tracking
can lead to power management issues, potentially causing audio
devices to not power up/down correctly, which directly impacts users.
The commit fixes a real bug where the DAPM bias level state could become
out of sync with the actual hardware state, particularly for card-level
DAPM contexts. This is exactly the type of bug fix that stable kernels
should include - it's small, targeted, fixes a real issue, and has
minimal risk of introducing regressions.
sound/soc/soc-dapm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index acb46e1f9c0a..175c8c264b62 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -743,6 +743,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_dapm_context *dapm,
out:
trace_snd_soc_bias_level_done(card, level);
+ /* success */
+ if (ret == 0)
+ snd_soc_dapm_init_bias_level(dapm, level);
+
return ret;
}
--
2.39.5
next prev parent reply other threads:[~2025-08-04 0:41 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-04 0:40 [PATCH AUTOSEL 5.10 01/39] usb: xhci: print xhci->xhc_state when queue_command failed Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 02/39] cpufreq: CPPC: Mark driver with NEED_UPDATE_LIMITS flag Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 03/39] selftests/futex: Define SYS_futex on 32-bit architectures with 64-bit time_t Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 04/39] usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 05/39] regulator: core: repeat voltage setting request for stepped regulators Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 06/39] usb: xhci: Avoid showing warnings for dying controller Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 07/39] usb: xhci: Set avg_trb_len = 8 for EP0 during Address Device Command Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 08/39] usb: xhci: Avoid showing errors during surprise removal Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 09/39] gpio: wcd934x: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 10/39] cpufreq: Exit governor when failed to start old governor Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 11/39] ARM: rockchip: fix kernel hang during smp initialization Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 12/39] PM / devfreq: governor: Replace sscanf() with kstrtoul() in set_freq_store() Sasha Levin
2025-08-04 0:40 ` Sasha Levin [this message]
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 14/39] gpio: tps65912: check the return value of regmap_update_bits() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 15/39] ARM: tegra: Use I/O memcpy to write to IRAM Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 16/39] selftests: tracing: Use mutex_unlock for testing glob filter Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 17/39] PM: runtime: Clear power.needs_force_resume in pm_runtime_reinit() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 18/39] thermal: sysfs: Return ENODATA instead of EAGAIN for reads Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 19/39] PM: sleep: console: Fix the black screen issue Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 20/39] ACPI: processor: fix acpi_object initialization Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 21/39] mmc: sdhci-msm: Ensure SD card power isn't ON when card removed Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 22/39] ACPI: APEI: GHES: add TAINT_MACHINE_CHECK on GHES panic path Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 23/39] reset: brcmstb: Enable reset drivers for ARCH_BCM2835 Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 24/39] mmc: rtsx_usb_sdmmc: Fix error-path in sd_set_power_mode() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 25/39] x86/bugs: Avoid warning when overriding return thunk Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 26/39] ASoC: hdac_hdmi: Rate limit logging on connection and disconnection Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 27/39] ALSA: intel8x0: Fix incorrect codec index usage in mixer for ICH4 Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 28/39] ASoC: core: Check for rtd == NULL in snd_soc_remove_pcm_runtime() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 29/39] usb: typec: intel_pmc_mux: Defer probe if SCU IPC isn't present Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 30/39] usb: core: usb_submit_urb: downgrade type check Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 31/39] usb: typec: fusb302: fix scheduling while atomic when using virtio-gpio Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 32/39] pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop() Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 33/39] platform/x86: thinkpad_acpi: Handle KCOV __init vs inline mismatches Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 34/39] platform/chrome: cros_ec_typec: Defer probe on missing EC parent Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 35/39] ALSA: hda/ca0132: Fix buffer overflow in add_tuning_control Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 36/39] ALSA: pcm: Rewrite recalculate_boundary() to avoid costly loop Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 37/39] ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 38/39] iio: adc: ad7768-1: Ensure SYNC_IN pulse minimum timing requirement Sasha Levin
2025-08-04 0:40 ` [PATCH AUTOSEL 5.10 39/39] ASoC: codecs: rt5640: Retry DEVICE_ID verification Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250804004041.3628812-13-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-sound@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox