All of lore.kernel.org
 help / color / mirror / Atom feed
From: phucduc.bui@gmail.com
To: Mark Brown <broonie@kernel.org>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>,
	Trevor Wu <trevor.wu@mediatek.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	cassiogabrielcontato@gmail.com,
	Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>,
	Liviu Dudau <liviu.dudau@arm.com>,
	Haotian Zhang <vulab@iscas.ac.cn>,
	HariKrishna Sagala <hariconscious@gmail.com>,
	linux-sound@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
	bui duc phuc <phucduc.bui@gmail.com>
Subject: [PATCH 07/14] ASoC: mediatek: mt8195: Fix runtime resume error handling
Date: Fri, 25 Sep 2026 11:49:01 +0700	[thread overview]
Message-ID: <20260925044908.450775-8-phucduc.bui@gmail.com> (raw)
In-Reply-To: <20260925044908.450775-1-phucduc.bui@gmail.com>

From: bui duc phuc <phucduc.bui@gmail.com>

Check and propagate errors when enabling the register access and main
clocks during runtime resume.

If regcache_sync() or main clock enable fails, restore regmap cache-only
mode and disable the register access clocks before returning the error.

Fixes: 6746cc858259 ("ASoC: mediatek: mt8195: add platform driver")
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
---
 sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
index 5e76625915a5..be150c0f5472 100644
--- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
+++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c
@@ -2958,18 +2958,31 @@ static int mt8195_afe_runtime_resume(struct device *dev)
 {
 	struct mtk_base_afe *afe = dev_get_drvdata(dev);
 	struct mt8195_afe_private *afe_priv = afe->platform_priv;
+	int ret;
 
-	mt8195_afe_enable_reg_rw_clk(afe);
+	ret = mt8195_afe_enable_reg_rw_clk(afe);
+	if (ret)
+		return ret;
 
 	if (!afe->regmap || afe_priv->pm_runtime_bypass_reg_ctl)
-		goto skip_regmap;
+		return 0;
 
 	regcache_cache_only(afe->regmap, false);
-	regcache_sync(afe->regmap);
+	ret = regcache_sync(afe->regmap);
+	if (ret)
+		goto err_restore_cache;
+
+	ret = mt8195_afe_enable_main_clock(afe);
+	if (ret)
+		goto err_restore_cache;
 
-	mt8195_afe_enable_main_clock(afe);
-skip_regmap:
 	return 0;
+
+err_restore_cache:
+	regcache_cache_only(afe->regmap, true);
+	mt8195_afe_disable_reg_rw_clk(afe);
+
+	return ret;
 }
 
 static int init_memif_priv_data(struct mtk_base_afe *afe)
-- 
2.43.0



  parent reply	other threads:[~2026-09-25  4:50 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-25  4:48 [PATCH 00/14] ASoC: mediatek: mt8195: Fix clock error handling phucduc.bui
2026-09-25  4:48 ` [PATCH 01/14] ASoC: mediatek: mt8195: Fix tuner " phucduc.bui
2026-09-25  4:48 ` [PATCH 02/14] ASoC: mediatek: mt8195: Use dev_err_probe() in mt8195_afe_init_clock() phucduc.bui
2026-09-25  4:48 ` [PATCH 03/14] ASoC: mediatek: mt8195: Fix register access clock error handling phucduc.bui
2026-09-25  4:48 ` [PATCH 04/14] ASoC: mediatek: mt8195: Fix timing system " phucduc.bui
2026-09-25  4:48 ` [PATCH 05/14] ASoC: mediatek: mt8195: Fix paired memif " phucduc.bui
2026-09-25  4:49 ` [PATCH 06/14] ASoC: mediatek: mt8195: Fix FE startup " phucduc.bui
2026-10-04 19:49   ` Mark Brown
2026-10-05  7:12     ` Bui Duc Phuc
2026-10-05  8:10       ` Mark Brown
2026-10-05  9:36         ` Bui Duc Phuc
2026-10-05 10:29           ` Mark Brown
2026-10-05 10:34             ` Bui Duc Phuc
2026-09-25  4:49 ` phucduc.bui [this message]
2026-09-25  4:49 ` [PATCH 08/14] ASoC: mediatek: mt8195: Remove redundant error message phucduc.bui
2026-09-25  4:49 ` [PATCH 09/14] ASoC: mediatek: mt8195: Propagate IRQ lookup errors phucduc.bui
2026-09-25  4:49 ` [PATCH 10/14] ASoC: mediatek: mt8195: Fix ETDM MCLK error handling phucduc.bui
2026-09-25  4:49 ` [PATCH 11/14] ASoC: mediatek: mt8195: Fix ETDM startup " phucduc.bui
2026-09-25  4:49 ` [PATCH 12/14] ASoC: mediatek: mt8195: Fix HDMI TX " phucduc.bui
2026-09-25  4:49 ` [PATCH 13/14] ASoC: mediatek: mt8195: Fix ETDM probe " phucduc.bui
2026-09-25  4:49 ` [PATCH 14/14] ASoC: mediatek: mt8195: Fix clock parent " phucduc.bui

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=20260925044908.450775-8-phucduc.bui@gmail.com \
    --to=phucduc.bui@gmail.com \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=broonie@kernel.org \
    --cc=cassiogabrielcontato@gmail.com \
    --cc=hariconscious@gmail.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=liviu.dudau@arm.com \
    --cc=matthias.bgg@gmail.com \
    --cc=mukesh.ojha@oss.qualcomm.com \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    --cc=trevor.wu@mediatek.com \
    --cc=vulab@iscas.ac.cn \
    /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.