Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb24ee41 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent af813a6f

sound/soc/codecs/wm_adsp.c

+12 −7
Original line number Original line Diff line number Diff line
@@ -2552,6 +2552,8 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w, 
		queue_work(system_unbound_wq, &dsp->boot_work);

		queue_work(system_unbound_wq, &dsp->boot_work);

		break;

		break;

	case SND_SOC_DAPM_PRE_PMD:

	case SND_SOC_DAPM_PRE_PMD:

		mutex_lock(&dsp->pwr_lock);



		wm_adsp_debugfs_clear(dsp);

		wm_adsp_debugfs_clear(dsp);





		dsp->fw_id = 0;

		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);

		wm_adsp_free_alg_regions(dsp);





		mutex_unlock(&dsp->pwr_lock);



		adsp_dbg(dsp, "Shutdown complete\n");

		adsp_dbg(dsp, "Shutdown complete\n");

		break;

		break;

	default:

	default:
@@ -2589,8 +2593,12 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
	case SND_SOC_DAPM_POST_PMU:

	case SND_SOC_DAPM_POST_PMU:

		flush_work(&dsp->boot_work);

		flush_work(&dsp->boot_work);





		if (!dsp->booted)

		mutex_lock(&dsp->pwr_lock);

			return -EIO;



		if (!dsp->booted) {

			ret = -EIO;

			goto err;

		}





		ret = wm_adsp2_ena(dsp);

		ret = wm_adsp2_ena(dsp);

		if (ret != 0)

		if (ret != 0)
@@ -2610,15 +2618,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 




		dsp->running = true;

		dsp->running = true;





		mutex_lock(&dsp->pwr_lock);



		if (wm_adsp_fw[dsp->fw].num_caps != 0) {

		if (wm_adsp_fw[dsp->fw].num_caps != 0) {

			ret = wm_adsp_buffer_init(dsp);

			ret = wm_adsp_buffer_init(dsp);

			if (ret < 0) {

			if (ret < 0)

				mutex_unlock(&dsp->pwr_lock);

				goto err;

				goto err;

		}

		}

		}





		mutex_unlock(&dsp->pwr_lock);

		mutex_unlock(&dsp->pwr_lock);
@@ -2662,6 +2666,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, 
err:

err:

	regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,

	regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,

			   ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);

			   ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);

	mutex_unlock(&dsp->pwr_lock);

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(wm_adsp2_event);

EXPORT_SYMBOL_GPL(wm_adsp2_event);