ASoC: SOF: Intel: Use guard() for spinlocks where it makes sense

Replace the manual spinlock lock/unlock pairs with guard().

Only code refactoring, and no behavior change.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20260112101004.7648-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/intel/atom.c b/sound/soc/sof/intel/atom.c
index 0d364bcdcfa9ba371b5fa0c30400d875b886b769..32bf5e5e59788183d7b7c06393e031d6a713c6e4 100644 (file)
--- a/sound/soc/sof/intel/atom.c
+++ b/sound/soc/sof/intel/atom.c
@@ -143,9 +143,6 @@ irqreturn_t atom_irq_thread(int irq, void *context)
 
        /* reply message from DSP */
        if (ipcx & SHIM_BYT_IPCX_DONE) {
-
-               spin_lock_irq(&sdev->ipc_lock);
-
                /*
                 * handle immediate reply from DSP core. If the msg is
                 * found, set done bit in cmd_done which is called at the
@@ -153,11 +150,9 @@ irqreturn_t atom_irq_thread(int irq, void *context)
                 * because the done bit can't be set in cmd_done function
                 * which is triggered by msg
                 */
+               guard(spinlock_irq)(&sdev->ipc_lock);
                snd_sof_ipc_process_reply(sdev, ipcx);
-
                atom_dsp_done(sdev);
-
-               spin_unlock_irq(&sdev->ipc_lock);
        }
 
        /* new message from DSP */

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index f1287d509835be8d7bddbb34b70430b2d8cf98cc..9534d18be97dfefa1fc70c012f59e384c2032681 100644 (file)
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -315,9 +315,6 @@ static irqreturn_t bdw_irq_thread(int irq, void *context)
                snd_sof_dsp_update_bits_unlocked(sdev, BDW_DSP_BAR,
                                                 SHIM_IMRX, SHIM_IMRX_DONE,
                                                 SHIM_IMRX_DONE);
-
-               spin_lock_irq(&sdev->ipc_lock);
-
                /*
                 * handle immediate reply from DSP core. If the msg is
                 * found, set done bit in cmd_done which is called at the
@@ -325,11 +322,9 @@ static irqreturn_t bdw_irq_thread(int irq, void *context)
                 * because the done bit can't be set in cmd_done function
                 * which is triggered by msg
                 */
+               guard(spinlock_irq)(&sdev->ipc_lock);
                snd_sof_ipc_process_reply(sdev, ipcx);
-
                bdw_dsp_done(sdev);
-
-               spin_unlock_irq(&sdev->ipc_lock);
        }
 
        ipcd = snd_sof_dsp_read(sdev, BDW_DSP_BAR, SHIM_IPCD);

diff --git a/sound/soc/sof/intel/cnl.c b/sound/soc/sof/intel/cnl.c
index 0cc5725515e7cb433274ac79b05b91a0d216178d..69376fb5b20d41c1bd8bcb85e3060e063f58c1f5 100644 (file)
--- a/sound/soc/sof/intel/cnl.c
+++ b/sound/soc/sof/intel/cnl.c
@@ -69,13 +69,10 @@ irqreturn_t cnl_ipc4_irq_thread(int irq, void *context)
                                data->primary = primary;
                                data->extension = extension;
 
-                               spin_lock_irq(&sdev->ipc_lock);
-
+                               guard(spinlock_irq)(&sdev->ipc_lock);
                                snd_sof_ipc_get_reply(sdev);
                                cnl_ipc_host_done(sdev);
                                snd_sof_ipc_reply(sdev, data->primary);
-
-                               spin_unlock_irq(&sdev->ipc_lock);
                        } else {
                                dev_dbg_ratelimited(sdev->dev,
                                                    "IPC reply before FW_READY: %#x|%#x\n",
@@ -141,15 +138,11 @@ irqreturn_t cnl_ipc_irq_thread(int irq, void *context)
                                        CNL_DSP_REG_HIPCCTL_DONE, 0);
 
                if (likely(sdev->fw_state == SOF_FW_BOOT_COMPLETE)) {
-                       spin_lock_irq(&sdev->ipc_lock);
-
                        /* handle immediate reply from DSP core */
+                       guard(spinlock_irq)(&sdev->ipc_lock);
                        hda_dsp_ipc_get_reply(sdev);
                        snd_sof_ipc_reply(sdev, msg);
-
                        cnl_ipc_dsp_done(sdev);
-
-                       spin_unlock_irq(&sdev->ipc_lock);
                } else {
                        dev_dbg_ratelimited(sdev->dev, "IPC reply before FW_READY: %#x\n",
                                            msg);

diff --git a/sound/soc/sof/intel/hda-dai-ops.c b/sound/soc/sof/intel/hda-dai-ops.c
index cdfa3636f70cb17921aa8dbe0c20245575836568..b2c55955996294a87388062f4dddb5986bf983e4 100644 (file)
--- a/sound/soc/sof/intel/hda-dai-ops.c
+++ b/sound/soc/sof/intel/hda-dai-ops.c
@@ -58,7 +58,7 @@ hda_link_stream_assign(struct hdac_bus *bus, struct snd_pcm_substream *substream
                return NULL;
        }
 
-       spin_lock_irq(&bus->reg_lock);
+       guard(spinlock_irq)(&bus->reg_lock);
        list_for_each_entry(hstream, &bus->stream_list, list) {
                struct hdac_ext_stream *hext_stream =
                        stream_to_hdac_ext_stream(hstream);
@@ -110,7 +110,6 @@ hda_link_stream_assign(struct hdac_bus *bus, struct snd_pcm_substream *substream
                res->link_locked = 1;
                res->link_substream = substream;
        }
-       spin_unlock_irq(&bus->reg_lock);
 
        return res;
 }

diff --git a/sound/soc/sof/intel/hda-ipc.c b/sound/soc/sof/intel/hda-ipc.c
index 94425c51086170b61af5a88ce58a591461431277..2aef3954f4f7f7edae7ff02b1f8bb86fa186d3d1 100644 (file)
--- a/sound/soc/sof/intel/hda-ipc.c
+++ b/sound/soc/sof/intel/hda-ipc.c
@@ -204,13 +204,10 @@ irqreturn_t hda_dsp_ipc4_irq_thread(int irq, void *context)
                                data->primary = primary;
                                data->extension = extension;
 
-                               spin_lock_irq(&sdev->ipc_lock);
-
+                               guard(spinlock_irq)(&sdev->ipc_lock);
                                snd_sof_ipc_get_reply(sdev);
                                hda_dsp_ipc_host_done(sdev);
                                snd_sof_ipc_reply(sdev, data->primary);
-
-                               spin_unlock_irq(&sdev->ipc_lock);
                        } else {
                                dev_dbg_ratelimited(sdev->dev,
                                                    "IPC reply before FW_READY: %#x|%#x\n",
@@ -289,16 +286,12 @@ irqreturn_t hda_dsp_ipc_irq_thread(int irq, void *context)
                 * reply.
                 */
                if (likely(sdev->fw_state == SOF_FW_BOOT_COMPLETE)) {
-                       spin_lock_irq(&sdev->ipc_lock);
-
                        /* handle immediate reply from DSP core */
+                       guard(spinlock_irq)(&sdev->ipc_lock);
                        hda_dsp_ipc_get_reply(sdev);
                        snd_sof_ipc_reply(sdev, msg);
-
                        /* set the done bit */
                        hda_dsp_ipc_dsp_done(sdev);
-
-                       spin_unlock_irq(&sdev->ipc_lock);
                } else {
                        dev_dbg_ratelimited(sdev->dev, "IPC reply before FW_READY: %#x\n",
                                            msg);

diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c
index 9c3b3a9aaf83c92237fd26c867d3854c7b11b9a7..8fdaf1fdc338d74558e3ce432ba2b7f2b5723dde 100644 (file)
--- a/sound/soc/sof/intel/hda-stream.c
+++ b/sound/soc/sof/intel/hda-stream.c
@@ -724,12 +724,12 @@ int hda_dsp_stream_hw_free(struct snd_sof_dev *sdev,
                struct hdac_bus *bus = sof_to_bus(sdev);
                u32 mask = BIT(hstream->index);
 
-               spin_lock_irq(&bus->reg_lock);
+               guard(spinlock_irq)(&bus->reg_lock);
+
                /* couple host and link DMA if link DMA channel is idle */
                if (!hext_stream->link_locked)
                        snd_sof_dsp_update_bits(sdev, HDA_DSP_PP_BAR,
                                                SOF_HDA_REG_PP_PPCTL, mask, 0);
-               spin_unlock_irq(&bus->reg_lock);
        }
 
        hda_dsp_stream_spib_config(sdev, hext_stream, HDA_DSP_SPIB_DISABLE, 0);
@@ -747,7 +747,7 @@ bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev)
        u32 status;
 
        /* The function can be called at irq thread, so use spin_lock_irq */
-       spin_lock_irq(&bus->reg_lock);
+       guard(spinlock_irq)(&bus->reg_lock);
 
        status = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS);
 
@@ -757,8 +757,6 @@ bool hda_dsp_check_stream_irq(struct snd_sof_dev *sdev)
        if (status != 0xffffffff)
                ret = true;
 
-       spin_unlock_irq(&bus->reg_lock);
-
        return ret;
 }
 EXPORT_SYMBOL_NS(hda_dsp_check_stream_irq, "SND_SOC_SOF_INTEL_HDA_COMMON");
@@ -842,7 +840,7 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
         * unsolicited responses from the codec
         */
        for (i = 0, active = true; i < 10 && active; i++) {
-               spin_lock_irq(&bus->reg_lock);
+               guard(spinlock_irq)(&bus->reg_lock);
 
                status = snd_sof_dsp_read(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTSTS);
 
@@ -853,7 +851,6 @@ irqreturn_t hda_dsp_stream_threaded_handler(int irq, void *context)
                if (status & AZX_INT_CTRL_EN) {
                        active |= hda_codec_check_rirb_status(sdev);
                }
-               spin_unlock_irq(&bus->reg_lock);
        }
 
        return IRQ_HANDLED;

diff --git a/sound/soc/sof/intel/mtl.c b/sound/soc/sof/intel/mtl.c
index 095dcf1a18e4f2c406148dbbffa69b836a68970c..4ac81537ca0539f0ce328cff997bd9eec1b0893d 100644 (file)
--- a/sound/soc/sof/intel/mtl.c
+++ b/sound/soc/sof/intel/mtl.c
@@ -596,13 +596,10 @@ static irqreturn_t mtl_ipc_irq_thread(int irq, void *context)
                                data->primary = primary;
                                data->extension = extension;
 
-                               spin_lock_irq(&sdev->ipc_lock);
-
+                               guard(spinlock_irq)(&sdev->ipc_lock);
                                snd_sof_ipc_get_reply(sdev);
                                mtl_ipc_host_done(sdev);
                                snd_sof_ipc_reply(sdev, data->primary);
-
-                               spin_unlock_irq(&sdev->ipc_lock);
                        } else {
                                dev_dbg_ratelimited(sdev->dev,
                                                    "IPC reply before FW_READY: %#x|%#x\n",