ASoC: Intel: Convert locking to guard()/scoped_guard()
Subsystems (3)
v2 cover ASoC: Intel: Convert locking to guard()/scoped_guard()
From: bui duc phuc <[email protected]>
Hi all,
This series converts mutex and spinlock handling in Intel ASoC drivers to use guard()/scoped_guard() helpers.
Most changes are straightforward conversions intended to simplify lock handling and cleanup paths, with no intended functional changes.
The series has been compile-tested only.
Link v1:
https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Reduce the series from 20 patches to 4 patches.
- Drop smaller conversions that did not provide clear benefits.
Best regards,
Phuc
bui duc phuc (4):
ASoC: Intel: avs: Use guard() for locking
ASoC: Intel: avs: Use scoped_guard() for scoped locking
ASoC: Intel: atom: Use scoped_guard() for scoped locking
ASoC: Intel: atom: Use guard() for locking
sound/soc/intel/atom/sst-atom-controls.c | 64 +++++++---------- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 51 +++++--------- sound/soc/intel/atom/sst/sst_ipc.c | 4 +- sound/soc/intel/atom/sst/sst_pvt.c | 8 +-- sound/soc/intel/avs/apl.c | 7 +- sound/soc/intel/avs/control.c | 7 +- sound/soc/intel/avs/core.c | 3 +- sound/soc/intel/avs/debug.h | 9 +-- sound/soc/intel/avs/debugfs.c | 18 +++-- sound/soc/intel/avs/ipc.c | 73 +++++++++----------- sound/soc/intel/avs/loader.c | 14 ++-- sound/soc/intel/avs/path.c | 29 +++----- sound/soc/intel/avs/utils.c | 39 ++++------- 13 files changed, 125 insertions(+), 201 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/4 ASoC: Intel: avs: Use guard() for locking
From: bui duc phuc <[email protected]>
Clean up the code using guard() for spin & mutex locks. Merely code refactoring, and no behavior change.
--- sound/soc/intel/avs/apl.c | 7 ++----- sound/soc/intel/avs/control.c | 7 ++----- sound/soc/intel/avs/core.c | 3 +-- sound/soc/intel/avs/debug.h | 9 ++------ sound/soc/intel/avs/ipc.c | 10 +++------ sound/soc/intel/avs/path.c | 29 +++++++------------------- sound/soc/intel/avs/utils.c | 39 ++++++++++++----------------------- 7 files changed, 31 insertions(+), 73 deletions(-)
sound/soc/intel/avs/apl.c +2 -5
@@ -190,7 +190,7 @@ static bool avs_apl_lp_streaming(struct avs_dev *adev) {struct avs_path *path; -spin_lock (&adev->path_list_lock); +guard (spinlock)(&adev->path_list_lock);/* Any gateway without buffer allocated in LP area disqualifies D0IX. */ list_for_each_entry (path, &adev->path_list, node) {struct avs_path_pipeline *ppl;
@@ -210,14 +210,11 @@ static bool avs_apl_lp_streaming(struct avs_dev *adev)if (cfg->copier.dma_type ==INVALID_OBJECT_ID )continue ; -if (!mod->gtw_attrs.lp_buffer_alloc) { -spin_unlock (&adev->path_list_lock); +if (!mod->gtw_attrs.lp_buffer_alloc)return false; - } } } } -spin_unlock (&adev->path_list_lock);return true; }
sound/soc/intel/avs/control.c +2 -5
@@ -27,7 +27,7 @@ static struct avs_path_module *avs_get_volume_module(struct avs_dev *adev, u32 istruct avs_path_pipeline *ppl;struct avs_path_module *mod; -spin_lock (&adev->path_list_lock); +guard (spinlock)(&adev->path_list_lock);list_for_each_entry (path, &adev->path_list, node) {list_for_each_entry (ppl, &path->ppl_list, node) {list_for_each_entry (mod, &ppl->mod_list, node) {
@@ -35,14 +35,11 @@ static struct avs_path_module *avs_get_volume_module(struct avs_dev *adev, u32 iif ((guid_equal (type, &AVS_PEAKVOL_MOD_UUID ) ||guid_equal (type, &AVS_GAIN_MOD_UUID )) && - mod->template->ctl_id == id) { -spin_unlock (&adev->path_list_lock); + mod->template->ctl_id == id)return mod; - } } } } -spin_unlock (&adev->path_list_lock);return NULL ; }
sound/soc/intel/avs/core.c +1 -2
@@ -273,7 +273,7 @@ static irqreturn_t avs_hda_interrupt(struct hdac_bus *bus)if (snd_hdac_bus_handle_stream_irq (bus, status, hdac_update_stream)) ret =IRQ_HANDLED ; -spin_lock_irq (&bus->reg_lock); +guard (spinlock_irq)(&bus->reg_lock);/* Clear RIRB interrupt. */ status =snd_hdac_chip_readb (bus,RIRBSTS );if (status &RIRB_INT_MASK ) {
@@ -283,7 +283,6 @@ static irqreturn_t avs_hda_interrupt(struct hdac_bus *bus) ret =IRQ_HANDLED ; } -spin_unlock_irq (&bus->reg_lock);return ret; }
sound/soc/intel/avs/debug.h +2 -7
@@ -26,14 +26,9 @@ struct avs_dev;static inline int avs_log_buffer_status_locked (struct avs_dev *adev,union avs_notify_msg *msg) { -unsigned long flags; -int ret; +guard (spinlock_irqsave)(&adev->trace_lock); -spin_lock_irqsave (&adev->trace_lock, flags); - ret =avs_dsp_op (adev, log_buffer_status, msg); -spin_unlock_irqrestore (&adev->trace_lock, flags); - -return ret; +return avs_dsp_op (adev, log_buffer_status, msg); }struct avs_apl_log_buffer_layout {
sound/soc/intel/avs/ipc.c +3 -7
@@ -397,7 +397,7 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *requestif (!ipc->ready)return -EPERM ; -mutex_lock (&ipc->msg_mutex); +guard (mutex)(&ipc->msg_mutex);spin_lock (&ipc->rx_lock);avs_ipc_msg_init (ipc, reply);
@@ -412,7 +412,7 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *request/* Same treatment as on exception, just stack_dump=0. */ avs_dsp_exception_caught (adev, &msg); } - goto exit; +return ret; } ret = ipc->rx.rsp.status;
@@ -436,8 +436,6 @@ static int avs_dsp_do_send_msg(struct avs_dev *adev, struct avs_ipc_msg *requestmemcpy (reply->data, ipc->rx.data, reply->size); } -exit: -mutex_unlock (&ipc->msg_mutex);return ret; }
@@ -501,7 +499,7 @@ static int avs_dsp_do_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *reqstruct avs_ipc *ipc = adev->ipc;int ret; -mutex_lock (&ipc->msg_mutex); +guard (mutex)(&ipc->msg_mutex);spin_lock (&ipc->rx_lock);avs_ipc_msg_init (ipc,NULL );
@@ -522,8 +520,6 @@ static int avs_dsp_do_send_rom_msg(struct avs_dev *adev, struct avs_ipc_msg *reqdev_err (adev->dev,"%s (0x%08x 0x%08x) failed: %d\n" , name, request->glb.primary, request->glb.ext.val, ret); -mutex_unlock (&ipc->msg_mutex); -return ret; }
sound/soc/intel/avs/path.c +8 -21
@@ -69,16 +69,13 @@ avs_path_find_path(struct avs_dev *adev, const char *name, u32 template_id)if (!template)return NULL ; -spin_lock (&adev->path_list_lock); +guard (spinlock)(&adev->path_list_lock);/* Only one variant of given path template may be instantiated at a time. */ list_for_each_entry (path, &adev->path_list, node) { -if (path->template->owner == template) { -spin_unlock (&adev->path_list_lock); +if (path->template->owner == template)return path; - } } -spin_unlock (&adev->path_list_lock);return NULL ; }
@@ -1305,7 +1302,7 @@ void avs_path_free(struct avs_path *path)struct avs_path *cpath, *csave;struct avs_dev *adev = path->owner; -mutex_lock (&adev->path_mutex); +guard (mutex)(&adev->path_mutex);/* Free all condpaths this path spawned. */ list_for_each_entry_safe (cpath, csave, &path->source_list, source_node)
@@ -1314,8 +1311,6 @@ void avs_path_free(struct avs_path *path)avs_condpath_free (path->owner, cpath);avs_path_free_unlocked (path); - -mutex_unlock (&adev->path_mutex); } struct avs_path *avs_path_create(struct avs_dev *adev, u32 dma_id,
@@ -1334,13 +1329,13 @@ struct avs_path *avs_path_create(struct avs_dev *adev, u32 dma_id, }/* Serialize path and its components creation. */ -mutex_lock (&adev->path_mutex); +guard (mutex)(&adev->path_mutex);/* Satisfy needs of avs_path_find_tplg(). */ -mutex_lock (&adev->comp_list_mutex); +guard (mutex)(&adev->comp_list_mutex); path =avs_path_create_unlocked (adev, dma_id, variant);if (IS_ERR (path)) - goto exit; +return path; ret =avs_condpaths_walk_all (adev, path);if (ret) {
@@ -1348,10 +1343,6 @@ struct avs_path *avs_path_create(struct avs_dev *adev, u32 dma_id, path =ERR_PTR (ret); } -exit: -mutex_unlock (&adev->comp_list_mutex); -mutex_unlock (&adev->path_mutex); -return path; }
@@ -1496,15 +1487,13 @@ static void avs_condpaths_pause(struct avs_dev *adev, struct avs_path *path) {struct avs_path *cpath; -mutex_lock (&adev->path_mutex); +guard (mutex)(&adev->path_mutex);/* If either source or sink stops, so do the attached conditional paths. */ list_for_each_entry (cpath, &path->source_list, source_node)avs_condpath_pause (adev, cpath);list_for_each_entry (cpath, &path->sink_list, sink_node)avs_condpath_pause (adev, cpath); - -mutex_unlock (&adev->path_mutex); }int avs_path_pause (struct avs_path *path)
@@ -1560,7 +1549,7 @@ static void avs_condpaths_run(struct avs_dev *adev, struct avs_path *path, int t {struct avs_path *cpath; -mutex_lock (&adev->path_mutex); +guard (mutex)(&adev->path_mutex);/* Run conditional paths only if source and sink are both running. */ list_for_each_entry (cpath, &path->source_list, source_node)
@@ -1572,8 +1561,6 @@ static void avs_condpaths_run(struct avs_dev *adev, struct avs_path *path, int tif (cpath->source->state ==AVS_PPL_STATE_RUNNING && cpath->sink->state ==AVS_PPL_STATE_RUNNING )avs_condpath_run (adev, cpath, trigger); - -mutex_unlock (&adev->path_mutex); }int avs_path_run (struct avs_path *path,int trigger)
sound/soc/intel/avs/utils.c +13 -26
@@ -48,13 +48,12 @@ int avs_get_module_entry(struct avs_dev *adev, const guid_t *uuid, struct avs_mo {int idx; -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); idx =avs_module_entry_index (adev, uuid);if (idx >=0 )memcpy (entry, &adev->mods_info->entries[idx],sizeof (*entry)); -mutex_unlock (&adev->modres_mutex);return (idx <0 ) ? idx :0 ; }
@@ -62,13 +61,12 @@ int avs_get_module_id_entry(struct avs_dev *adev, u32 module_id, struct avs_modu {int idx; -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); idx =avs_module_id_entry_index (adev, module_id);if (idx >=0 )memcpy (entry, &adev->mods_info->entries[idx],sizeof (*entry)); -mutex_unlock (&adev->modres_mutex);return (idx <0 ) ? idx :0 ; }
@@ -86,13 +84,12 @@ bool avs_is_module_ida_empty(struct avs_dev *adev, u32 module_id)bool ret = false;int idx; -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); idx =avs_module_id_entry_index (adev, module_id);if (idx >=0 ) ret =ida_is_empty (adev->mod_idas[idx]); -mutex_unlock (&adev->modres_mutex);return ret; }
@@ -163,50 +160,44 @@ int avs_module_info_init(struct avs_dev *adev, bool purge)if (ret)return AVS_IPC_RET (ret); -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); ret =avs_module_ida_alloc (adev, info, purge);if (ret <0 ) {dev_err (adev->dev,"initialize module idas failed: %d\n" , ret); - goto exit; +return ret; }/* Refresh current information with newly received table. */ kfree (adev->mods_info); adev->mods_info = info; -exit: -mutex_unlock (&adev->modres_mutex);return ret; }void avs_module_info_free (struct avs_dev *adev) { -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex);avs_module_ida_destroy (adev);kfree (adev->mods_info); adev->mods_info =NULL ; - -mutex_unlock (&adev->modres_mutex); }int avs_module_id_alloc (struct avs_dev *adev,u16 module_id) {int ret, idx, max_id; -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); idx =avs_module_id_entry_index (adev, module_id);if (idx == -ENOENT ) {dev_err (adev->dev,"invalid module id: %d" , module_id); - ret = -EINVAL ; - goto exit; +return -EINVAL ; } max_id = adev->mods_info->entries[idx].instance_max_count -1 ; ret =ida_alloc_max (adev->mod_idas[idx], max_id,GFP_KERNEL ); -exit: -mutex_unlock (&adev->modres_mutex); +return ret; }
@@ -214,17 +205,13 @@ void avs_module_id_free(struct avs_dev *adev, u16 module_id, u8 instance_id) {int idx; -mutex_lock (&adev->modres_mutex); +guard (mutex)(&adev->modres_mutex); idx =avs_module_id_entry_index (adev, module_id); -if (idx == -ENOENT ) { +if (idx == -ENOENT )dev_err (adev->dev,"invalid module id: %d" , module_id); - goto exit; - } - -ida_free (adev->mod_idas[idx], instance_id); -exit: -mutex_unlock (&adev->modres_mutex); +else +ida_free (adev->mod_idas[idx], instance_id); }/*
Signature · 1 line
2.43.0
PATCH v2 2/4 ASoC: Intel: avs: Use scoped_guard() for scoped locking
In reply to [email protected]From: bui duc phuc <[email protected]>
Clean up the code using scoped_guard() for mutex & spin locks. Merely code refactoring, and no behavior change.
--- sound/soc/intel/avs/debugfs.c | 18 +++++----- sound/soc/intel/avs/ipc.c | 63 +++++++++++++++++------------------ sound/soc/intel/avs/loader.c | 14 ++++---- 3 files changed, 45 insertions(+), 50 deletions(-)
sound/soc/intel/avs/debugfs.c +8 -10
@@ -251,24 +251,22 @@ static int strace_release(struct inode *inode, struct file *file)union avs_notify_msg msg =AVS_NOTIFICATION (LOG_BUFFER_STATUS );struct avs_dev *adev = file->private_data;unsigned long resource_mask; -unsigned long flags, i; +unsigned long i;u32 num_cores; resource_mask = adev->logged_resources; num_cores = adev->hw_cfg.dsp_cores; -spin_lock_irqsave (&adev->trace_lock, flags); + scoped_guard(spinlock_irqsave, &adev->trace_lock) { +/* Gather any remaining logs. */ +for_each_set_bit (i, &resource_mask, num_cores) { + msg.log.core = i; +avs_dsp_op (adev, log_buffer_status, &msg); + } -/* Gather any remaining logs. */ -for_each_set_bit (i, &resource_mask, num_cores) { - msg.log.core = i; -avs_dsp_op (adev, log_buffer_status, &msg); +kfifo_free (&adev->trace_fifo); } -kfifo_free (&adev->trace_fifo); - -spin_unlock_irqrestore (&adev->trace_lock, flags); -module_put (adev->dev->driver->owner);return 0 ; }
sound/soc/intel/avs/ipc.c +30 -33
90 lines not on this page · raw message
sound/soc/intel/avs/loader.c +7 -7
@@ -630,15 +630,15 @@ static int avs_load_firmware(struct avs_dev *adev, bool purge)if (ret) goto reenable_gating; -mutex_lock (&adev->comp_list_mutex); -list_for_each_entry (acomp, &adev->comp_list, node) { -struct avs_tplg *tplg = acomp->tplg; + scoped_guard(mutex, &adev->comp_list_mutex) { +list_for_each_entry (acomp, &adev->comp_list, node) { +struct avs_tplg *tplg = acomp->tplg; - ret =avs_dsp_load_libraries (adev, tplg->libs, tplg->num_libs); -if (ret <0 ) -break ; + ret =avs_dsp_load_libraries (adev, tplg->libs, tplg->num_libs); +if (ret <0 ) +break ; + } } -mutex_unlock (&adev->comp_list_mutex); reenable_gating:avs_hda_l1sen_enable (adev, true);
Signature · 1 line
2.43.0
Mark Brown
maintainerRe: [PATCH v2 2/4] ASoC: Intel: avs: Use scoped_guard() for scoped locking
Quoted 15 lines · On Thu, Jun 18, 2026 at 06:06:46PM +0700, [email protected] wrote:
Clean up the code using
scoped_guard()for mutex & spin locks. Merely code refactoring, and no behavior change.sound/soc/intel/avs/ipc.c +5
-3@@ -338,21 +338,18 @@ static int avs_ipc_wait_busy_completion(struct avs_ipc *ipc, int timeout) }/* Ongoing notification's bottom-half may cause early wakeup */ -spin_lock (&ipc->rx_lock); -if (!ipc->rx_completed) { -if (repeats_left) { + scoped_guard(spinlock, &ipc->rx_lock) { +if (!ipc->rx_completed) { +if (!repeats_left) +return -ETIMEDOUT ; +
sound/soc/intel/avs/ipc.c static int avs_ipc_wait_busy_completion(struct avs_ipc *ipc, int timeout) · line 351
Quoted 10 lines
sound/soc/intel/avs/ipc.c +0
-4/* Reply delayed due to notification. */ repeats_left--;reinit_completion (&ipc->busy_completion); -spin_unlock (&ipc->rx_lock); goto again; } - -spin_unlock (&ipc->rx_lock); -return -ETIMEDOUT ; }
This has a goto from a scoped_guard().
Re: [PATCH v2 2/4] ASoC: Intel: avs: Use scoped_guard() for scoped locking
Hi Mark,
Thanks for the review.
Quoted 10 lines
sound/soc/intel/avs/ipc.c static int avs_ipc_wait_busy_completion(struct avs_ipc *ipc, int timeout) · line 351
Quoted 8 lines
reinit_completion(&ipc->busy_completion);sound/soc/intel/avs/ipc.c +0
-4-spin_unlock (&ipc->rx_lock); goto again; } - -spin_unlock (&ipc->rx_lock); -return -ETIMEDOUT ; }This has a goto from a
scoped_guard().
I think converting this code to use scoped_guard() is not appropriate here. I'll leave this function unchanged in the next version.
Best regards,
Phuc
PATCH v2 3/4 ASoC: Intel: atom: Use scoped_guard() for scoped locking
In reply to [email protected]From: bui duc phuc <[email protected]>
Convert mutex-protected sections to scoped_guard() helpers and simplify cleanup paths. Also use __free(kfree) for the temporary stream pointer in sst_media_open().
No functional change intended.
--- sound/soc/intel/atom/sst-atom-controls.c | 36 ++++++++++---------- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 26 ++++++-------- 2 files changed, 29 insertions(+), 33 deletions(-)
sound/soc/intel/atom/sst-atom-controls.c +18 -18
@@ -761,27 +761,27 @@ int sst_handle_vb_timer(struct snd_soc_dai *dai, bool enable)return ret; } -mutex_lock (&drv->lock); -if (enable) - timer_usage++; -else - timer_usage--; - -/* -* Send the command only if this call is the first enable or last -* disable -*/ -if ((enable && (timer_usage ==1 )) || - (!enable && (timer_usage ==0 ))) { - ret =sst_fill_and_send_cmd_unlocked (drv,SST_IPC_IA_CMD , -SST_FLAG_BLOCKED ,SST_TASK_SBA ,0 , &cmd, -sizeof (cmd.header) + cmd.header.length); -if (ret && enable) { + scoped_guard(mutex, &drv->lock) { +if (enable) + timer_usage++; +else timer_usage--; - enable = false; + +/* +* Send the command only if this call is the first enable or last +* disable +*/ +if ((enable && (timer_usage ==1 )) || + (!enable && (timer_usage ==0 ))) { + ret =sst_fill_and_send_cmd_unlocked (drv,SST_IPC_IA_CMD , +SST_FLAG_BLOCKED ,SST_TASK_SBA ,0 , &cmd, +sizeof (cmd.header) + cmd.header.length); +if (ret && enable) { + timer_usage--; + enable = false; + } } } -mutex_unlock (&drv->lock);if (!enable) sst->ops->power (sst->dev, false);
sound/soc/intel/atom/sst-mfld-platform-pcm.c +11 -15
@@ -304,7 +304,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, {int ret_val =0 ;struct snd_pcm_runtime *runtime = substream->runtime; -struct sst_runtime_stream *stream; + struct sst_runtime_stream *stream __free(kfree) = NULL; stream =kzalloc_obj (*stream);if (!stream)
@@ -312,15 +312,14 @@ static int sst_media_open(struct snd_pcm_substream *substream,spin_lock_init (&stream->status_lock);/* get the sst ops */ -mutex_lock (&sst_lock); -if (!sst || - !try_module_get (sst->dev->driver->owner)) { -dev_err (dai->dev,"no device available to run\n" ); - ret_val = -ENODEV ; - goto out_ops; + scoped_guard(mutex, &sst_lock) { +if (!sst || + !try_module_get (sst->dev->driver->owner)) { +dev_err (dai->dev,"no device available to run\n" ); +return -ENODEV ; + } + stream->ops = sst->ops; } - stream->ops = sst->ops; -mutex_unlock (&sst_lock); stream->stream_info.str_id =0 ;
@@ -330,7 +329,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, ret_val =power_up_sst (stream);if (ret_val <0 ) - goto out_power_up; +return ret_val;/* * Make sure the period to be multiple of 1ms to align the
@@ -347,13 +346,10 @@ static int sst_media_open(struct snd_pcm_substream *substream,snd_pcm_hw_constraint_step (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_PERIODS ,2 ); + stream =NULL ; +return snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); -out_ops: -mutex_unlock (&sst_lock); -out_power_up: -kfree (stream); -return ret_val; } static void sst_media_close(struct snd_pcm_substream *substream,
Signature · 1 line
2.43.0
Cezary Rojewski
maintainerRe: [PATCH v2 3/4] ASoC: Intel: atom: Use scoped_guard() for scoped locking
Quoted 7 lines · On 6/18/2026 1:06 PM, [email protected] wrote:
From: bui duc phuc <[email protected]>
Convert mutex-protected sections to
scoped_guard()helpers and simplify cleanup paths. Also use__free(kfree)for the temporary stream pointer insst_media_open().No functional change intended.
...
sound/soc/intel/atom/sst-mfld-platform-pcm.c static int sst_media_open(struct snd_pcm_substream *substream, · line 307
Quoted 10 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +1
-1@@ -304,7 +304,7 @@ static int sst_media_open(struct snd_pcm_substream *substream, {int ret_val =0 ;struct snd_pcm_runtime *runtime = substream->runtime; -struct sst_runtime_stream *stream; + struct sst_runtime_stream *stream __free(kfree) = NULL;
No mixing of cleanup classes. Cleaning locking != cleaning pointers. One action per patch.
...
sound/soc/intel/atom/sst-mfld-platform-pcm.c static int sst_media_open(struct snd_pcm_substream *substream, · line 350
Quoted 6 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +2
-0@@ -347,13 +346,10 @@ static int sst_media_open(struct snd_pcm_substream *substream,snd_pcm_hw_constraint_step (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_PERIODS ,2 ); + stream =NULL ; +
Is this needed? If you believe so, then I'd rather see it placed immediately after any operation that could cause the variable to leave the scope.
Quoted 10 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +0
-5return snd_pcm_hw_constraint_integer (runtime,SNDRV_PCM_HW_PARAM_PERIODS ); -out_ops: -mutex_unlock (&sst_lock); -out_power_up: -kfree (stream); -return ret_val; } static void sst_media_close(struct snd_pcm_substream *substream,
Re: [PATCH v2 3/4] ASoC: Intel: atom: Use scoped_guard() for scoped locking
Hi Cezary,
Thanks for the review.
Quoted 11 lines
Quoted 1 line
+ struct
sst_runtime_stream*stream__free(kfree)= NULL;No mixing of cleanup classes. Cleaning locking != cleaning pointers. One action per patch.
...
Quoted 4 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +0
-0@@ -347,13 +346,10 @@ static int sst_media_open(struct snd_pcm_substream *substream,snd_pcm_hw_constraint_step (substream->runtime,0 ,SNDRV_PCM_HW_PARAM_PERIODS ,2 );
Quoted 7 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c static int sst_media_open(struct snd_pcm_substream *substream, · line 350
Quoted 2 lines
sound/soc/intel/atom/sst-mfld-platform-pcm.c +2
-0+ stream =NULL ; +Is this needed? If you believe so, then I'd rather see it placed immediately after any operation that could cause the variable to leave the scope.
I agree with your point. Here is how I will address them in V3 submission.
1. About splitting the patch :
I will split this change into a 2-patch for v3:
Patch 1 : Use scoped_guard() for scoped locking Patch 2 : Use __free(kfree) for stream pointer
2. About the "stream = NULL" assignment:
Yes, this is strictly necessary. Since 'stream' is managed by __free(kfree), setting it to NULL before a successful return ensures that the cleanup helper does not free the allocated memory upon function exit. The deallocation will be handled later by sst_media_close().
Based on your suggestion regarding the scope, I will move this assignment to be placed immediately after the final constraint operation where the variable leaves its effective scope.
- stream = NULL;
- return snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
+ ret_val = snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
+ if (ret_val < 0)
+ return ret_val;
+ stream = NULL;
+ return ret_val;
Does this alignment look good to you ?
Best regards,
Phuc
PATCH v2 4/4 ASoC: Intel: atom: Use guard() for locking
In reply to [email protected]From: bui duc phuc <[email protected]>
Clean up the code using guard() for spin & mutex locks. Merely code refactoring, and no behavior change.
--- sound/soc/intel/atom/sst-atom-controls.c | 28 ++++++-------------- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 25 ++++++----------- sound/soc/intel/atom/sst/sst_ipc.c | 4 +-- sound/soc/intel/atom/sst/sst_pvt.c | 8 +++--- 4 files changed, 20 insertions(+), 45 deletions(-)
sound/soc/intel/atom/sst-atom-controls.c +8 -20
@@ -73,14 +73,10 @@ static int sst_fill_and_send_cmd(struct sst_data *drv, u8 ipc_msg, u8 block, u8 task_id, u8 pipe_id, void *cmd_data, u16 len) { - int ret; + guard(mutex)(&drv->lock); -mutex_lock (&drv->lock); - ret =sst_fill_and_send_cmd_unlocked (drv, ipc_msg, block, - task_id, pipe_id, cmd_data, len); -mutex_unlock (&drv->lock); - -return ret; +return sst_fill_and_send_cmd_unlocked (drv, ipc_msg, block, + task_id, pipe_id, cmd_data, len); }/*
@@ -167,7 +163,7 @@ static int sst_slot_get(struct snd_kcontrol *kcontrol,unsigned int val, mux;u8 *map = is_tx ? sst_ssp_rx_map : sst_ssp_tx_map; -mutex_lock (&drv->lock); +guard (mutex)(&drv->lock); val =1 << ctl_no;/* search which slot/channel has this bit set - there should be only one */ for (mux = e->max; mux >0 ; mux--)
@@ -175,7 +171,6 @@ static int sst_slot_get(struct snd_kcontrol *kcontrol,break ; ucontrol->value.enumerated.item[0 ] = mux; -mutex_unlock (&drv->lock); dev_dbg(c->dev, "%s - %s map = %#x\n", is_tx ? "tx channel" : "rx slot",
@@ -235,7 +230,7 @@ static int sst_slot_put(struct snd_kcontrol *kcontrol,if (mux > e->max -1 )return -EINVAL ; -mutex_lock (&drv->lock); +guard (mutex)(&drv->lock);/* first clear all registers of this bit */ for (i =0 ; i < e->max; i++) map[i] &= ~val;
@@ -244,7 +239,6 @@ static int sst_slot_put(struct snd_kcontrol *kcontrol,/* kctl set to 'none' and we reset the bits so send IPC */ ret =sst_check_and_send_slot_map (drv, kcontrol); -mutex_unlock (&drv->lock);return ret; }
@@ -258,7 +252,6 @@ static int sst_slot_put(struct snd_kcontrol *kcontrol, ret =sst_check_and_send_slot_map (drv, kcontrol); -mutex_unlock (&drv->lock);return ret; }
@@ -354,13 +347,12 @@ static int sst_algo_control_set(struct snd_kcontrol *kcontrol,struct sst_algo_control *bc = (void *)kcontrol->private_value;dev_dbg (cmpnt->dev,"control_name=%s\n" , kcontrol->id.name); -mutex_lock (&drv->lock); +guard (mutex)(&drv->lock);switch (bc->type) {case SST_ALGO_PARAMS :memcpy (bc->params, ucontrol->value.bytes.data, bc->max);break ;default : -mutex_unlock (&drv->lock);dev_err (cmpnt->dev,"Invalid Input- algo type:%d\n" , bc->type);return -EINVAL ;
@@ -368,7 +360,6 @@ static int sst_algo_control_set(struct snd_kcontrol *kcontrol,/*if pipe is enabled, need to send the algo params from here*/ if (bc->w && bc->w->power) ret =sst_send_algo_cmd (drv, bc); -mutex_unlock (&drv->lock);return ret; }
@@ -475,7 +466,7 @@ static int sst_gain_put(struct snd_kcontrol *kcontrol,struct sst_gain_mixer_control *mc = (void *)kcontrol->private_value;struct sst_gain_value *gv = mc->gain_val; -mutex_lock (&drv->lock); +guard (mutex)(&drv->lock);switch (mc->type) {case SST_GAIN_TLV :
@@ -497,7 +488,6 @@ static int sst_gain_put(struct snd_kcontrol *kcontrol,break ;default : -mutex_unlock (&drv->lock);dev_err (cmpnt->dev,"Invalid Input- gain type:%d\n" , mc->type);return -EINVAL ;
@@ -506,7 +496,6 @@ static int sst_gain_put(struct snd_kcontrol *kcontrol,if (mc->w && mc->w->power) ret =sst_send_gain_cmd (drv, gv, mc->task_id, mc->pipe_id | mc->instance_id, mc->module_id,0 ); -mutex_unlock (&drv->lock);return ret; }
@@ -521,10 +510,9 @@ static int sst_send_pipe_module_params(struct snd_soc_dapm_widget *w,struct sst_data *drv =snd_soc_component_get_drvdata (c);struct sst_ids *ids = w->priv; -mutex_lock (&drv->lock); +guard (mutex)(&drv->lock);sst_find_and_send_pipe_algo (drv, w->name, ids);sst_set_pipe_gain (ids, drv,0 ); -mutex_unlock (&drv->lock);return 0 ; }
sound/soc/intel/atom/sst-mfld-platform-pcm.c +8 -17
@@ -32,16 +32,15 @@ int sst_register_dsp(struct sst_device *dev)return -EINVAL ;if (!try_module_get (dev->dev->driver->owner))return -ENODEV ; -mutex_lock (&sst_lock); +guard (mutex)(&sst_lock);if (sst) {dev_err (dev->dev,"we already have a device %s\n" , sst->name);module_put (dev->dev->driver->owner); -mutex_unlock (&sst_lock);return -EEXIST ; }dev_dbg (dev->dev,"registering device %s\n" , dev->name); sst = dev; -mutex_unlock (&sst_lock); +return 0 ; }EXPORT_SYMBOL_GPL (sst_register_dsp);
@@ -53,17 +52,15 @@ int sst_unregister_dsp(struct sst_device *dev)if (dev != sst)return -EINVAL ; -mutex_lock (&sst_lock); +guard (mutex)(&sst_lock); -if (!sst) { -mutex_unlock (&sst_lock); +if (!sst)return -EIO ; - }module_put (sst->dev->driver->owner);dev_dbg (dev->dev,"unreg %s\n" , sst->name); sst =NULL ; -mutex_unlock (&sst_lock); +return 0 ; }EXPORT_SYMBOL_GPL (sst_unregister_dsp);
@@ -103,21 +100,15 @@ static int sst_media_digital_mute(struct snd_soc_dai *dai, int mute, int stream)void sst_set_stream_status (struct sst_runtime_stream *stream,int state) { -unsigned long flags; -spin_lock_irqsave (&stream->status_lock, flags); +guard (spinlock_irqsave)(&stream->status_lock); stream->stream_status = state; -spin_unlock_irqrestore (&stream->status_lock, flags); }static inline int sst_get_stream_status (struct sst_runtime_stream *stream) { -int state; -unsigned long flags; +guard (spinlock_irqsave)(&stream->status_lock); -spin_lock_irqsave (&stream->status_lock, flags); - state = stream->stream_status; -spin_unlock_irqrestore (&stream->status_lock, flags); -return state; +return stream->stream_status; } static void sst_fill_alloc_params(struct snd_pcm_substream *substream,
sound/soc/intel/atom/sst/sst_ipc.c +1 -3
@@ -180,9 +180,8 @@ void intel_sst_clear_intr_mrfld(struct intel_sst_drv *sst_drv_ctx)union interrupt_reg_mrfld isr;union interrupt_reg_mrfld imr;union ipc_header_mrfld clear_ipc; -unsigned long irq_flags; -spin_lock_irqsave (&sst_drv_ctx->ipc_spin_lock, irq_flags); +guard (spinlock_irqsave)(&sst_drv_ctx->ipc_spin_lock); imr.full =sst_shim_read64 (sst_drv_ctx->shim,SST_IMRX ); isr.full =sst_shim_read64 (sst_drv_ctx->shim,SST_ISRX );
@@ -200,7 +199,6 @@ void intel_sst_clear_intr_mrfld(struct intel_sst_drv *sst_drv_ctx)/* un mask busy interrupt */ imr.part.busy_interrupt =0 ;sst_shim_write64 (sst_drv_ctx->shim,SST_IMRX , imr.full); -spin_unlock_irqrestore (&sst_drv_ctx->ipc_spin_lock, irq_flags); }
sound/soc/intel/atom/sst/sst_pvt.c +3 -5
@@ -64,9 +64,8 @@ u64 sst_shim_read64(void __iomem *addr, int offset)void sst_set_fw_state_locked (struct intel_sst_drv *sst_drv_ctx,int sst_state) { -mutex_lock (&sst_drv_ctx->sst_lock); +guard (mutex)(&sst_drv_ctx->sst_lock); sst_drv_ctx->sst_state = sst_state; -mutex_unlock (&sst_drv_ctx->sst_lock); }/*
@@ -302,18 +301,17 @@ int sst_assign_pvt_id(struct intel_sst_drv *drv) {int local; -spin_lock (&drv->block_lock); +guard (spinlock)(&drv->block_lock);/* find first zero index from lsb */ local =ffz (drv->pvt_id);dev_dbg (drv->dev,"pvt_id assigned --> %d\n" , local);if (local >=SST_MAX_BLOCKS ){ -spin_unlock (&drv->block_lock);dev_err (drv->dev,"PVT _ID error: no free id blocks " );return -EINVAL ; }/* toggle the index */ change_bit (local, &drv->pvt_id); -spin_unlock (&drv->block_lock); +return local; }
Signature · 1 line
2.43.0
Re: [PATCH v2 4/4] ASoC: Intel: atom: Use guard() for locking
Quoted 4 lines · On 6/18/2026 1:06 PM, [email protected] wrote:
From: bui duc phuc <[email protected]>
Clean up the code using
guard()for spin & mutex locks. Merely code refactoring, and no behavior change.
Looks good.