Skip to content

Commit

Permalink
ASoC: rockchip: i2s: Fix regmap_ops hang
Browse files Browse the repository at this point in the history
[ Upstream commit 53ca9b9 ]

API 'set_fmt' maybe called when PD is off, in the situation,
any register access will hang the system. so, enable PD
before r/w register.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Link: https://lore.kernel.org/r/1629950520-14190-4-git-send-email-sugar.zhang@rock-chips.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Sugar Zhang authored and gregkh committed Sep 18, 2021
1 parent 7344a8a commit 969eddc
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions sound/soc/rockchip/rockchip_i2s.c
Expand Up @@ -186,7 +186,9 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
{
struct rk_i2s_dev *i2s = to_info(cpu_dai);
unsigned int mask = 0, val = 0;
int ret = 0;

pm_runtime_get_sync(cpu_dai->dev);
mask = I2S_CKR_MSS_MASK;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
Expand All @@ -199,7 +201,8 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
i2s->is_master_mode = false;
break;
default:
return -EINVAL;
ret = -EINVAL;
goto err_pm_put;
}

regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
Expand All @@ -213,7 +216,8 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
val = I2S_CKR_CKP_POS;
break;
default:
return -EINVAL;
ret = -EINVAL;
goto err_pm_put;
}

regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
Expand All @@ -236,7 +240,8 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1);
break;
default:
return -EINVAL;
ret = -EINVAL;
goto err_pm_put;
}

regmap_update_bits(i2s->regmap, I2S_TXCR, mask, val);
Expand All @@ -259,12 +264,16 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1);
break;
default:
return -EINVAL;
ret = -EINVAL;
goto err_pm_put;
}

regmap_update_bits(i2s->regmap, I2S_RXCR, mask, val);

return 0;
err_pm_put:
pm_runtime_put(cpu_dai->dev);

return ret;
}

static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
Expand Down

0 comments on commit 969eddc

Please sign in to comment.