Commit fabfad2f authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm8958: Move DSP firmware lock to driver level 



The wm8958 driver uses the snd_soc_codec mutex to protect the various
firmware pointers from concurrent assignment. This patch moves this lock to
the driver level. This will allow us to eventually remove the snd_soc_codec
mutex.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 78660af7

sound/soc/codecs/wm8958-dsp2.c

+6 −6
Original line number Diff line number Diff line
@@ -867,9 +867,9 @@ static void wm8958_enh_eq_loaded(const struct firmware *fw, void *context) 
	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);



	if (fw && (wm8958_dsp2_fw(codec, "ENH_EQ", fw, true) == 0)) {

		mutex_lock(&codec->mutex);

		mutex_lock(&wm8994->fw_lock);

		wm8994->enh_eq = fw;

		mutex_unlock(&codec->mutex);

		mutex_unlock(&wm8994->fw_lock);

	}

}
@@ -879,9 +879,9 @@ static void wm8958_mbc_vss_loaded(const struct firmware *fw, void *context) 
	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);



	if (fw && (wm8958_dsp2_fw(codec, "MBC+VSS", fw, true) == 0)) {

		mutex_lock(&codec->mutex);

		mutex_lock(&wm8994->fw_lock);

		wm8994->mbc_vss = fw;

		mutex_unlock(&codec->mutex);

		mutex_unlock(&wm8994->fw_lock);

	}

}
@@ -891,9 +891,9 @@ static void wm8958_mbc_loaded(const struct firmware *fw, void *context) 
	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);



	if (fw && (wm8958_dsp2_fw(codec, "MBC", fw, true) == 0)) {

		mutex_lock(&codec->mutex);

		mutex_lock(&wm8994->fw_lock);

		wm8994->mbc = fw;

		mutex_unlock(&codec->mutex);

		mutex_unlock(&wm8994->fw_lock);

	}

}

sound/soc/codecs/wm8994.c

+2 −0
Original line number Diff line number Diff line
@@ -4457,6 +4457,8 @@ static int wm8994_probe(struct platform_device *pdev) 
		return -ENOMEM;

	platform_set_drvdata(pdev, wm8994);



	mutex_init(&wm8994->fw_lock);



	wm8994->wm8994 = dev_get_drvdata(pdev->dev.parent);



	pm_runtime_enable(&pdev->dev);

sound/soc/codecs/wm8994.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/firmware.h>

#include <linux/completion.h>

#include <linux/workqueue.h>

#include <linux/mutex.h>



#include "wm_hubs.h"
@@ -156,6 +157,7 @@ struct wm8994_priv { 
	unsigned int aif1clk_disable:1;

	unsigned int aif2clk_disable:1;



	struct mutex fw_lock;

	int dsp_active;

	const struct firmware *cur_fw;

	const struct firmware *mbc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE