ASoC: wm_adsp: Correct some missing locking

The recent refactoring overlooked some places which should be covered by
the pwr_lock, all code that affects or depends on the power status of
the DSP should be covered, this patch adds the missing coverage.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 12 insertions, 7 deletions

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index ed615ce8a496..09e50e5e7870 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2552,6 +2552,8 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
                 queue_work(system_unbound_wq, &dsp->boot_work);
                 break;
         case SND_SOC_DAPM_PRE_PMD:
+                mutex_lock(&dsp->pwr_lock);
+
                 wm_adsp_debugfs_clear(dsp);
 
                 dsp->fw_id = 0;
@@ -2567,6 +2569,8 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
 
                 wm_adsp_free_alg_regions(dsp);
 
+                mutex_unlock(&dsp->pwr_lock);
+
                 adsp_dbg(dsp, "Shutdown complete\n");
                 break;
         default:
@@ -2589,8 +2593,12 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
         case SND_SOC_DAPM_POST_PMU:
                 flush_work(&dsp->boot_work);
 
-                if (!dsp->booted)
-                        return -EIO;
+                mutex_lock(&dsp->pwr_lock);
+
+                if (!dsp->booted) {
+                        ret = -EIO;
+                        goto err;
+                }
 
                 ret = wm_adsp2_ena(dsp);
                 if (ret != 0)
@@ -2610,14 +2618,10 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
 
                 dsp->running = true;
 
-                mutex_lock(&dsp->pwr_lock);
-
                 if (wm_adsp_fw[dsp->fw].num_caps != 0) {
                         ret = wm_adsp_buffer_init(dsp);
-                        if (ret < 0) {
-                                mutex_unlock(&dsp->pwr_lock);
+                        if (ret < 0)
                                 goto err;
-                        }
                 }
 
                 mutex_unlock(&dsp->pwr_lock);
@@ -2662,6 +2666,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
 err:
         regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
                            ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
+        mutex_unlock(&dsp->pwr_lock);
         return ret;
 }
 EXPORT_SYMBOL_GPL(wm_adsp2_event);