All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	alsa-devel@alsa-project.org,
	Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang
Date: Thu, 26 Aug 2021 12:01:50 +0800	[thread overview]
Message-ID: <1629950520-14190-4-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629950441-14118-1-git-send-email-sugar.zhang@rock-chips.com>

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>
---

Changes in v3: None
Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 2e0047d..90877e8 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -187,7 +187,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:
@@ -200,7 +202,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);
@@ -214,7 +217,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);
@@ -237,7 +241,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);
@@ -260,12 +265,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,
-- 
2.7.4




WARNING: multiple messages have this Message-ID (diff)
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	alsa-devel@alsa-project.org,
	Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang
Date: Thu, 26 Aug 2021 12:01:50 +0800	[thread overview]
Message-ID: <1629950520-14190-4-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629950441-14118-1-git-send-email-sugar.zhang@rock-chips.com>

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>
---

Changes in v3: None
Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 2e0047d..90877e8 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -187,7 +187,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:
@@ -200,7 +202,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);
@@ -214,7 +217,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);
@@ -237,7 +241,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);
@@ -260,12 +265,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,
-- 
2.7.4




_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: Sugar Zhang <sugar.zhang@rock-chips.com>,
	linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org,
	devicetree@vger.kernel.org
Subject: [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang
Date: Thu, 26 Aug 2021 12:01:50 +0800	[thread overview]
Message-ID: <1629950520-14190-4-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629950441-14118-1-git-send-email-sugar.zhang@rock-chips.com>

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>
---

Changes in v3: None
Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index 2e0047d..90877e8 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -187,7 +187,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:
@@ -200,7 +202,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);
@@ -214,7 +217,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);
@@ -237,7 +241,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);
@@ -260,12 +265,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,
-- 
2.7.4




  parent reply	other threads:[~2021-08-26  4:02 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-26  4:00 [PATCH v3 0/14] Patches to update for rockchip i2s Sugar Zhang
2021-08-26  4:00 ` Sugar Zhang
2021-08-26  4:00 ` Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 01/14] ASoC: rockchip: i2s: Add support for set bclk ratio Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 02/14] ASoC: rockchip: i2s: Fixup clk div error Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 03/14] ASoC: rockchip: i2s: Improve dma data transfer efficiency Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01 ` Sugar Zhang [this message]
2021-08-26  4:01   ` [PATCH v3 04/14] ASoC: rockchip: i2s: Fix regmap_ops hang Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01 ` [PATCH v3 05/14] ASoC: rockchip: i2s: Fix concurrency between tx/rx Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26  4:01   ` Sugar Zhang
2021-08-26 12:52   ` Mark Brown
2021-08-26 12:52     ` Mark Brown
2021-08-26 12:52     ` Mark Brown
2021-08-27  1:37     ` sugar zhang
2021-08-27  1:37       ` sugar zhang
2021-08-27  1:37       ` sugar zhang
2021-08-26  4:02 ` [PATCH v3 06/14] ASoC: rockchip: i2s: Reset the controller if soft reset failed Sugar Zhang
2021-08-26  4:02   ` Sugar Zhang
2021-08-26  4:02   ` Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 07/14] ASoC: dt-bindings: rockchip: Document reset property for i2s Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 08/14] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 09/14] ASoC: rockchip: i2s: Make playback/capture optional Sugar Zhang
2021-08-26  4:02   ` Sugar Zhang
2021-08-26  4:02   ` Sugar Zhang
2021-08-26  4:02 ` [PATCH v3 10/14] ASoC: rockchip: i2s: Add compatible for more SoCs Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 11/14] ASoC: dt-bindings: rockchip: Add compatible strings " Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 12/14] ASoC: rockchip: i2s: Add support for frame inversion Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 13/14] ASoC: rockchip: i2s: Add support for TRCM property Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03 ` [PATCH v3 14/14] ASoC: dt-bindings: rockchip: i2s: Document property TRCM Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26  4:03   ` Sugar Zhang
2021-08-26 14:15 ` (subset) [PATCH v3 0/14] Patches to update for rockchip i2s Mark Brown
2021-08-26 14:15   ` Mark Brown
2021-08-26 14:15   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1629950520-14190-4-git-send-email-sugar.zhang@rock-chips.com \
    --to=sugar.zhang@rock-chips.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=linux-rockchip@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.