From: sashiko-bot@kernel.org
To: "Srinivas Kandagatla" <srinivas.kandagatla@oss.qualcomm.com>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org,
robh@kernel.org, conor+dt@kernel.org
Subject: Re: [PATCH v2 13/24] ASoC: qcom: audioreach: add speaker protection calibration trigger infrastructure
Date: Sun, 22 Nov 2026 16:31:19 +0000 [thread overview]
Message-ID: <sashiko-outbox-228103@kernel.org> (raw)
In-Reply-To: <20261122161437.5994-14-srinivas.kandagatla@oss.qualcomm.com>
Thank you for your contribution! Sashiko AI review found 4 potential
issues to consider:
- [High] ASoC: qcom: audioreach: missing cancel_delayed_work_sync() on
module unload
- [Medium] ASoC: qcom: audioreach: watchdog race in
audioreach_sp_finish_calibration()
- [Medium] ASoC: qcom: audioreach: desynchronized calibration state on
timeout or error
- [Medium] ASoC: qcom: audioreach: split sp_operation_mode read across
SP and VI modules
--
commit 7fe6f8691f5f7dafda5123fc19c6776f167efe98
Author: Ravi Hothi <ravi.hothi@oss.qualcomm.com>
ASoC: qcom: audioreach: add speaker protection calibration trigger infrastructure
This commit introduces an internal speaker protection operation mode state
and an edge-triggered calibration helper backed by a 60-second delayed-work
watchdog.
> diff --git a/sound/soc/qcom/qdsp6/audioreach.c b/sound/soc/qcom/qdsp6/audioreach.c
> index 2b5c083b8ae56..130298a287496 100644
> --- a/sound/soc/qcom/qdsp6/audioreach.c
> +++ b/sound/soc/qcom/qdsp6/audioreach.c
[ ... ]
> @@ -1482,6 +1485,48 @@ static int audioreach_gain_set(struct q6apm_graph *graph,
> return q6apm_send_cmd_sync(graph->apm, pkt, 0);
> }
>
> +u32 audioreach_get_sp_operation_mode(void)
> +{
> + return READ_ONCE(sp_operation_mode);
> +}
> +
> +/*
> + * Calibration is edge-triggered rather than a user-visible mode. Guard
> + * against a trigger write while a run is still in flight, and bound the
> + * armed state with a watchdog so a trigger without a matching playback
> + * does not leave the system in Calibration forever.
> + */
> +#define SP_CAL_WATCHDOG_SECS 60
> +
> +static void audioreach_sp_cal_watchdog_fn(struct work_struct *work);
> +static DECLARE_DELAYED_WORK(sp_cal_watchdog, audioreach_sp_cal_watchdog_fn);
> +
> +static void audioreach_sp_cal_watchdog_fn(struct work_struct *work)
> +{
> + if (cmpxchg(&sp_operation_mode, PARAM_ID_SP_VI_OP_MODE_CALIBRATION,
> + PARAM_ID_SP_VI_OP_MODE_NORMAL) ==
> + PARAM_ID_SP_VI_OP_MODE_CALIBRATION)
> + pr_info("audioreach: SP calibration watchdog fired, back to Normal\n");
> +}
> +
> +static void audioreach_sp_finish_calibration(void)
> +{
> + WRITE_ONCE(sp_operation_mode, PARAM_ID_SP_VI_OP_MODE_NORMAL);
> + cancel_delayed_work(&sp_cal_watchdog);
> +}
[Severity: Medium]
Can audioreach_sp_finish_calibration() race with a new calibration trigger
or an already dequeued sp_cal_watchdog work item?
Because sp_operation_mode is reset to PARAM_ID_SP_VI_OP_MODE_NORMAL before
cancel_delayed_work(&sp_cal_watchdog) runs, a concurrent call to
audioreach_trigger_sp_calibration() can transition back to
PARAM_ID_SP_VI_OP_MODE_CALIBRATION in the window between the two lines:
CPU0 CPU1
audioreach_sp_finish_calibration()
WRITE_ONCE(sp_operation_mode, ..._NORMAL)
audioreach_trigger_sp_calibration()
cmpxchg(...) -> ..._CALIBRATION
schedule_delayed_work(&sp_cal_watchdog, ...)
cancel_delayed_work(&sp_cal_watchdog)
<-- cancels the new run's watchdog
If no playback completes after that, sp_operation_mode stays stuck in
PARAM_ID_SP_VI_OP_MODE_CALIBRATION with no pending watchdog, causing all
subsequent triggers to fail with -EBUSY.
Similarly, because cancel_delayed_work() is non-synchronous, an older run's
audioreach_sp_cal_watchdog_fn() that was just dequeued on another CPU can
execute its cmpxchg() after a new run has already been triggered, flipping
the new run prematurely back to PARAM_ID_SP_VI_OP_MODE_NORMAL.
> +
> +int audioreach_trigger_sp_calibration(void)
> +{
> + if (cmpxchg(&sp_operation_mode, PARAM_ID_SP_VI_OP_MODE_NORMAL,
> + PARAM_ID_SP_VI_OP_MODE_CALIBRATION) !=
> + PARAM_ID_SP_VI_OP_MODE_NORMAL)
> + return -EBUSY;
> +
> + schedule_delayed_work(&sp_cal_watchdog,
> + SP_CAL_WATCHDOG_SECS * HZ);
> + return 0;
> +}
[Severity: High]
Can unloading snd-q6apm while sp_cal_watchdog is pending cause a
use-after-free?
audioreach.o is linked into the tristate snd-q6apm module
(CONFIG_SND_SOC_QDSP6_APM), and audioreach_trigger_sp_calibration() queues
the static sp_cal_watchdog delayed work for 60 seconds. Neither
apm_remove() nor any other teardown path calls
cancel_delayed_work_sync(&sp_cal_watchdog), so if the driver is unbound or
the module is unloaded while the timer is pending or the work callback is
running, the timer fires into freed module text and data.
> +
> static bool sp_vi_cali_state_is_failure(u32 state)
> {
> return state == VI_CALIBRATION_STATE_FAILED ||
> @@ -1588,14 +1633,16 @@ void audioreach_vi_calibration_event(struct device *dev,
> }
>
> dev_info(dev, "VI calibration complete: %s\n", success ? "success" : "failed");
> +
> + /* Edge-triggered: the mode auto-returns to Normal on terminal state. */
> + audioreach_sp_finish_calibration();
> }
>
> static int audioreach_speaker_protection(struct q6apm_graph *graph,
> - const struct audioreach_module *module,
> - uint32_t operation_mode)
> + const struct audioreach_module *module)
> {
> return audioreach_send_u32_param(graph, module, PARAM_ID_SP_OP_MODE,
> - operation_mode);
> + READ_ONCE(sp_operation_mode));
> }
>
> static int audioreach_register_events(struct q6apm_graph *graph,
> @@ -1639,6 +1686,7 @@ static int audioreach_speaker_protection_vi(struct q6apm_graph *graph,
> const struct audioreach_module *module,
> const struct audioreach_module_config *mcfg)
> {
> + u32 mode = READ_ONCE(sp_operation_mode);
[Severity: Medium]
Can MODULE_ID_SPEAKER_PROTECTION and MODULE_ID_SPEAKER_PROTECTION_VI be
configured with different operation modes when sp_operation_mode changes
mid-prepare?
q6apm_graph_media_format_pcm() iterates over the modules in the graph and
sleeps in q6apm_send_cmd_sync() for each one. Because
audioreach_speaker_protection() and audioreach_speaker_protection_vi() read
sp_operation_mode independently without a shared lock across graph
configuration, a concurrent audioreach_trigger_sp_calibration() call or
sp_cal_watchdog expiration between the two IPC calls configures one module
in Normal mode and the other in Calibration mode. If VI is configured in
Calibration while SP was configured in Normal, the DSP reports
VI_CALIBRATION_STATE_INCORRECT_OP_MODE; if SP is configured in Calibration
while VI is configured in Normal, sp_vi_r0 is not armed and events are not
registered, leaving sp_operation_mode in Calibration until the watchdog
expires.
> u32 num_channels = mcfg->num_channels;
> struct apm_module_sp_vi_op_mode_cfg *op_cfg;
> struct apm_module_sp_vi_channel_map_cfg *cm_cfg;
> @@ -1662,11 +1710,13 @@ static int audioreach_speaker_protection_vi(struct q6apm_graph *graph,
> return -EINVAL;
> }
>
> - audioreach_arm_vi_calibration();
> + if (mode == PARAM_ID_SP_VI_OP_MODE_CALIBRATION) {
> + audioreach_arm_vi_calibration();
>
> - rc = audioreach_register_events(graph, module);
> - if (rc)
> - return rc;
> + rc = audioreach_register_events(graph, module);
> + if (rc)
> + return rc;
> + }
[Severity: Medium]
Does sp_vi_r0.armed stay desynchronized from sp_operation_mode when the
watchdog expires during an active run or when VI configuration fails?
When audioreach_sp_cal_watchdog_fn() fires 60 seconds after the trigger, it
flips sp_operation_mode back to PARAM_ID_SP_VI_OP_MODE_NORMAL without
acquiring sp_vi_r0_lock to clear sp_vi_r0.armed. Because
audioreach_speaker_protection_vi() neither cancels nor extends
sp_cal_watchdog when a calibration playback starts, a stream that starts
near the end of the 60-second window (or takes longer than 60 seconds to
reach a decisive state) will have sp_operation_mode reset to Normal while
calibration is still armed and running. A subsequent
audioreach_trigger_sp_calibration() call can then succeed instead of
returning -EBUSY, only to be clobbered when the first stream finishes and
calls audioreach_sp_finish_calibration().
In addition, audioreach_arm_vi_calibration() sets sp_vi_r0.armed = true
before audioreach_register_events(), audioreach_alloc_apm_cmd_pkt(), and
q6apm_send_cmd_sync(), so an error from any of those calls returns early
with sp_vi_r0.armed still set.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261122161437.5994-1-srinivas.kandagatla@oss.qualcomm.com?part=13
next prev parent reply other threads:[~2026-11-22 16:31 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-23 17:14 [RFC PATCH 00/23] ASoC: qcom: AudioReach Active speaker protection for WSA884x Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 01/23] ASoC: soc-core: allow default ch_maps on links with more than 8 DAIs Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:04 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 02/23] ASoC: soc-pcm: add multi_direction_codecs link flag Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:04 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 03/23] ASoC: qcom: sdw: add per-direction stream runtimes for multi_direction links Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:04 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 04/23] ASoC: dt-bindings: qcom,wsa8840: allow one sound DAI cell Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 05/23] ASoC: codecs: wsa884x: add VI sense capture DAI Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:03 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 06/23] ASoC: codecs: wsa884x: register the die temperature as a thermal zone Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 07/23] ASoC: qcom: audioreach: add control link support to graphs Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 08/23] ASoC: qcom: audioreach: run VI module in calibration mode with per-speaker events Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:04 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 09/23] ASoC: qcom: q6apm-dai: add S32_LE format support Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 10/23] ASoC: qcom: audioreach: support up to four speakers in VI feedback Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 11/23] ASoC: qcom: audioreach: cache VI calibration results per speaker Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 12/23] ASoC: qcom: audioreach: make the speaker protection operation mode configurable Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 13/23] ASoC: qcom: audioreach: send cached R0/T0 to the VI module in normal mode Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 14/23] ASoC: qcom: audioreach: send static cfg blobs to speaker protection modules Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 15/23] ASoC: qcom: audioreach: add speaker protection mixer controls Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 16/23] ASoC: qcom: audioreach: pin SPEAKER_PROTECTION_VI media format Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 17/23] ASoC: qcom: audioreach: add live speaker temperature (T0) readback Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 18/23] ASoC: qcom: audioreach: add speaker protection calibration state control Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 19/23] ASoC: qcom: audioreach: keep the last VI calibration result until the DSP reports Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 20/23] ASoC: qcom: x1e80100: carry WSA VI feedback on the WSA Playback BE link Srinivas Kandagatla
2026-11-15 17:36 ` Mark Brown
2026-11-15 21:03 ` Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 21/23] ASoC: qcom: x1e80100: register WSA speaker thermal zones for speaker protection Srinivas Kandagatla
2026-10-23 17:14 ` [RFC PATCH 22/23] arm64: dts: qcom: glymur-crd: add WSA speaker protection VI feedback Srinivas Kandagatla
2026-10-28 13:38 ` Konrad Dybcio
2026-10-28 21:59 ` Srinivas Kandagatla
2026-10-29 8:17 ` Konrad Dybcio
2026-10-23 17:14 ` [RFC PATCH 23/23] arm64: dts: qcom: mahua-t14s: " Srinivas Kandagatla
2026-10-28 12:39 ` [RFC PATCH 00/23] ASoC: qcom: AudioReach Active speaker protection for WSA884x Mark Brown
2026-10-28 16:31 ` Fabian Renn-Giles
2026-10-28 21:56 ` Srinivas Kandagatla
2026-11-15 22:07 ` Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 00/24] ASoC: qcom: AudioReach Active speaker protection for WSA88xx Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 01/24] ASoC: soc-core: always allocate default ch_maps Srinivas Kandagatla
2026-11-22 16:31 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 02/24] ASoC: soc-pcm: add multi_direction_codecs link flag Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 03/24] ASoC: soc-dai: export snd_soc_dai_stream_valid Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 04/24] ASoC: qcom: sdw: add per-direction stream runtimes for multi_direction links Srinivas Kandagatla
2026-11-22 16:38 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 05/24] ASoC: dt-bindings: qcom,wsa8840: allow one sound DAI cell Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 06/24] ASoC: codecs: wsa884x: add VI sense capture DAI Srinivas Kandagatla
2026-11-22 16:28 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 07/24] ASoC: codecs: wsa883x: " Srinivas Kandagatla
2026-11-22 16:28 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 08/24] ASoC: codecs: wsa884x: register the die temperature as a thermal zone Srinivas Kandagatla
2026-11-22 16:28 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 09/24] ASoC: qcom: audioreach: add control link support to graphs Srinivas Kandagatla
2026-11-22 16:32 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 10/24] ASoC: qcom: audioreach: run VI module in calibration mode with per-speaker events Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 11/24] ASoC: qcom: q6apm-dai: add S32_LE format support Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 12/24] ASoC: qcom: audioreach: cache VI calibration results per speaker Srinivas Kandagatla
2026-11-22 16:22 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 13/24] ASoC: qcom: audioreach: add speaker protection calibration trigger infrastructure Srinivas Kandagatla
2026-11-22 16:31 ` sashiko-bot [this message]
2026-11-22 16:14 ` [PATCH v2 14/24] ASoC: qcom: audioreach: send cached R0/T0 to the VI module in normal mode Srinivas Kandagatla
2026-11-22 16:28 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 15/24] ASoC: qcom: audioreach: send static cfg blobs to speaker protection modules Srinivas Kandagatla
2026-11-22 16:31 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 16/24] ASoC: qcom: audioreach: add speaker protection mixer controls Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 17/24] ASoC: qcom: audioreach: pin SPEAKER_PROTECTION_VI media format Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 18/24] ASoC: qcom: audioreach: add live speaker temperature (T0) readback Srinivas Kandagatla
2026-11-22 16:37 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 19/24] ASoC: qcom: audioreach: add speaker protection calibration state control Srinivas Kandagatla
2026-11-22 16:37 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 20/24] ASoC: qcom: x1e80100: carry WSA VI feedback on the WSA Playback BE link Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 21/24] ASoC: qcom: x1e80100: register WSA speaker thermal zones for speaker protection Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 22/24] arm64: dts: qcom: glymur-crd: add WSA speaker protection VI feedback Srinivas Kandagatla
2026-11-22 16:39 ` sashiko-bot
2026-11-22 16:14 ` [PATCH v2 23/24] arm64: dts: qcom: mahua-t14s: " Srinivas Kandagatla
2026-11-22 16:14 ` [PATCH v2 24/24] arm64: dts: qcom: x1e78100-t14s: " Srinivas Kandagatla
2026-11-22 16:37 ` sashiko-bot
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=sashiko-outbox-228103@kernel.org \
--to=sashiko-bot@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sashiko-reviews@lists.linux.dev \
--cc=srinivas.kandagatla@oss.qualcomm.com \
/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