xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s: Fix regmap_ops hang

Browse Source 
[ Upstream commit 53ca9b9777b95cdd689181d7c547e38dc79adad0 ]

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>
This commit is contained in:
Sugar Zhang
2021-08-26 12:01:50 +08:00
committed by Greg Kroah-Hartman
parent 7344a8a801
commit 969eddc3b4
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/rockchip/rockchip_i2s.c
View File

@@ -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); struct rk_i2s_dev *i2s = to_info(cpu_dai);
unsigned int mask = 0, val = 0; unsigned int mask = 0, val = 0;
int ret = 0;
pm_runtime_get_sync(cpu_dai->dev);
mask = I2S_CKR_MSS_MASK; mask = I2S_CKR_MSS_MASK;
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS: case SND_SOC_DAIFMT_CBS_CFS:
@@ -199,7 +201,8 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
i2s->is_master_mode = false; i2s->is_master_mode = false;
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
goto err_pm_put;
} }
regmap_update_bits(i2s->regmap, I2S_CKR, mask, val); regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
@@ -213,7 +216,8 @@ static int rockchip_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
val = I2S_CKR_CKP_POS; val = I2S_CKR_CKP_POS;
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
goto err_pm_put;
} }
regmap_update_bits(i2s->regmap, I2S_CKR, mask, val); regmap_update_bits(i2s->regmap, I2S_CKR, mask, val);
@@ -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); val = I2S_TXCR_TFS_PCM | I2S_TXCR_PBM_MODE(1);
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
goto err_pm_put;
} }
regmap_update_bits(i2s->regmap, I2S_TXCR, mask, val); regmap_update_bits(i2s->regmap, I2S_TXCR, mask, val);
@@ -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); val = I2S_RXCR_TFS_PCM | I2S_RXCR_PBM_MODE(1);
break; break;
default: default:
return -EINVAL; ret = -EINVAL;
goto err_pm_put;
} }
regmap_update_bits(i2s->regmap, I2S_RXCR, mask, val); 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, static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,