[alsa-devel] Applied "ASoC: rt1011: add mutex protection to set_fmt/set_tdm_slot" to the asoc tree

27 Aug 2019

The patch
ASoC: rt1011: add mutex protection to set_fmt/set_tdm_slot
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
...
From e9e897d5fdba9bda3a8c80ea39761413725f198c Mon Sep 17 00:00:00 2001
From: Shuming Fan shumingf@realtek.com
Date: Mon, 26 Aug 2019 17:00:52 +0800
Subject: [PATCH] ASoC: rt1011: add mutex protection to set_fmt/set_tdm_slot
The calibration process at booting will reset registers and bypass cache
to make sure the calibration is done.
We add mutex protection to avoid unexpected settings while
the registration process and calibration are interleaved.
Signed-off-by: Shuming Fan shumingf@realtek.com
Link: https://lore.kernel.org/r/20190826090052.1875-1-shumingf@realtek.com
Signed-off-by: Mark Brown broonie@kernel.org
---
 sound/soc/codecs/rt1011.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c
index 0a6ff13d76e1..ed28250d5e34 100644
--- a/sound/soc/codecs/rt1011.c
+++ b/sound/soc/codecs/rt1011.c
@@ -1619,14 +1619,18 @@ static int rt1011_hw_params(struct snd_pcm_substream *substream,
 static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 {
    struct snd_soc_component *component = dai->component;
+	struct snd_soc_dapm_context *dapm =
+		snd_soc_component_get_dapm(component);
    unsigned int reg_val = 0, reg_bclk_inv = 0;
+	int ret = 0;
+	snd_soc_dapm_mutex_lock(dapm);
    switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
    case SND_SOC_DAIFMT_CBS_CFS:
    	reg_val |= RT1011_I2S_TDM_MS_S;
    	break;
    default:
-		return -EINVAL;
+		ret = -EINVAL;
    }
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
@@ -1636,7 +1640,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
    	reg_bclk_inv |= RT1011_TDM_INV_BCLK;
    	break;
    default:
-		return -EINVAL;
+		ret = -EINVAL;
    }
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -1652,7 +1656,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
    	reg_val |= RT1011_I2S_TDM_DF_PCM_B;
    	break;
    default:
-		return -EINVAL;
+		ret = -EINVAL;
    }
switch (dai->id) {
@@ -1667,9 +1671,11 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
    	break;
    default:
    	dev_err(component->dev, "Invalid dai->id: %d\n", dai->id);
-		return -EINVAL;
+		ret = -EINVAL;
    }
-	return 0;
+
+	snd_soc_dapm_mutex_unlock(dapm);
+	return ret;
 }
static int rt1011_set_component_sysclk(struct snd_soc_component *component,
@@ -1788,8 +1794,12 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
    unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
 {
    struct snd_soc_component *component = dai->component;
+	struct snd_soc_dapm_context *dapm =
+		snd_soc_component_get_dapm(component);
    unsigned int val = 0, tdm_en = 0;
+	int ret = 0;
+	snd_soc_dapm_mutex_lock(dapm);
    if (rx_mask || tx_mask)
    	tdm_en = RT1011_TDM_I2S_DOCK_EN_1;
@@ -1809,7 +1819,7 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
    case 2:
    	break;
    default:
-		return -EINVAL;
+		ret = -EINVAL;
    }
switch (slot_width) {
@@ -1828,7 +1838,7 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
    case 16:
    	break;
    default:
-		return -EINVAL;
+		ret = -EINVAL;
    }
snd_soc_component_update_bits(component, RT1011_TDM1_SET_1,
@@ -1845,7 +1855,8 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,
    	RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG,
    	RT1011_ADCDAT1_OUTPUT | RT1011_ADCDAT2_OUTPUT);
-	return 0;
+	snd_soc_dapm_mutex_unlock(dapm);
+	return ret;
 }
static int rt1011_probe(struct snd_soc_component *component)
-- 
2.20.1


    