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

Commit 98381f84 authored by Sugar Zhang's avatar Sugar Zhang Committed by Greg Kroah-Hartman
Browse files

ASoC: rockchip: i2s: Fix regmap_ops hang 



[ 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: default avatarSugar 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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a1c7bc02

sound/soc/rockchip/rockchip_i2s.c

+14 −5
Original line number Diff line number Diff line
@@ -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:
@@ -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);
@@ -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);
@@ -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);
@@ -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,