ASoC: mediatek: mt8183: Fix wrong clock cleanup on clk_set_parent() failure
Subsystems (3)
PATCH 1/4 ASoC: mediatek: mt8183: Fix wrong clock cleanup on clk_set_parent() failure
From: bui duc phuc <[email protected]>
In mt8183_afe_enable_clock(), when clk_set_parent() fails, the current error path incorrectly cleans up the previously enabled clock instead of the clock used by clk_set_parent().
Fix the error path to clean up the correct clock when clk_set_parent() fails.
--- sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8183/mt8183-afe-clk.c +2 -2
@@ -137,7 +137,7 @@ int mt8183_afe_enable_clock(struct mtk_base_afe *afe)dev_err (afe->dev,"%s(), clk_set_parent %s-%s fail %d\n" , __func__, aud_clks[CLK_MUX_AUDIO ], aud_clks[CLK_CLK26M ], ret); - goto CLK_MUX_AUDIO_ERR; + goto CLK_MUX_AUDIO_INTBUS_ERR; } ret =clk_prepare_enable (afe_priv->clk[CLK_MUX_AUDIOINTBUS ]);
@@ -153,7 +153,7 @@ int mt8183_afe_enable_clock(struct mtk_base_afe *afe)dev_err (afe->dev,"%s(), clk_set_parent %s-%s fail %d\n" , __func__, aud_clks[CLK_MUX_AUDIOINTBUS ], aud_clks[CLK_TOP_SYSPLL_D2_D4 ], ret); - goto CLK_MUX_AUDIO_INTBUS_ERR; + goto CLK_AFE_ERR; } ret =clk_prepare_enable (afe_priv->clk[CLK_AFE ]);
Signature · 1 line
2.43.0
PATCH 2/4 ASoC: mediatek: mt8183: Fix APLL enable error handling
From: bui duc phuc <[email protected]>
Currently, the mt8183_apll*_enable() functions call mux_setting(afe, true) but do not check its return value to handle failures.
In addition, the cleanup paths of mt8183_apll*_enable() do not call mux_setting(afe, false) when the enable operation fails, while the mt8183_apll*_disable() functions do.
Add error handling for apll*_mux_setting() and call mux_setting(afe, false) in the cleanup paths when mt8183_apll*_enable() fails.
--- sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
sound/soc/mediatek/mt8183/mt8183-afe-clk.c +16 -2
@@ -382,7 +382,12 @@ int mt8183_apll1_enable(struct mtk_base_afe *afe)int ret;/* setting for APLL */ -apll1_mux_setting (afe, true); + ret =apll1_mux_setting (afe, true); +if (ret) { +dev_err (afe->dev,"%s apll1_mux_setting fail %d\n" , + __func__, ret); + goto ERR_APLL1_MUX_SETTING; + } ret =clk_prepare_enable (afe_priv->clk[CLK_APLL22M ]);if (ret) {
@@ -411,6 +416,8 @@ int mt8183_apll1_enable(struct mtk_base_afe *afe) ERR_CLK_APLL1_TUNER:clk_disable_unprepare (afe_priv->clk[CLK_APLL22M ]); ERR_CLK_APLL22M: +apll1_mux_setting (afe, false); +ERR_APLL1_MUX_SETTING:return ret; }
@@ -436,7 +443,12 @@ int mt8183_apll2_enable(struct mtk_base_afe *afe)int ret;/* setting for APLL */ -apll2_mux_setting (afe, true); + ret =apll2_mux_setting (afe, true); +if (ret) { +dev_err (afe->dev,"%s apll2_mux_setting fail %d\n" , + __func__, ret); + goto ERR_APLL2_MUX_SETTING; + } ret =clk_prepare_enable (afe_priv->clk[CLK_APLL24M ]);if (ret) {
@@ -465,6 +477,8 @@ int mt8183_apll2_enable(struct mtk_base_afe *afe) ERR_CLK_APLL2_TUNER:clk_disable_unprepare (afe_priv->clk[CLK_APLL24M ]); ERR_CLK_APLL24M: +apll2_mux_setting (afe, false); +ERR_APLL2_MUX_SETTING:return ret; }
Signature · 1 line
2.43.0
PATCH 3/4 ASoC: mediatek: mt8183: Use dev_err_probe() for error handling
In reply to [email protected]From: bui duc phuc <[email protected]>
Replace dev_err() with dev_err_probe() to prevent log spam when probe returns -EPROBE_DEFER.
--- sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt8183/mt8183-afe-clk.c +3 -6
@@ -101,12 +101,9 @@ int mt8183_init_clock(struct mtk_base_afe *afe)for (i =0 ; i <CLK_NUM ; i++) { afe_priv->clk[i] =devm_clk_get (afe->dev, aud_clks[i]); -if (IS_ERR (afe_priv->clk[i])) { -dev_err (afe->dev,"%s(), devm_clk_get %s fail, ret %ld\n" , - __func__, aud_clks[i], -PTR_ERR (afe_priv->clk[i])); -return PTR_ERR (afe_priv->clk[i]); - } +if (IS_ERR (afe_priv->clk[i])) +return dev_err_probe (afe->dev,PTR_ERR (afe_priv->clk[i]), +"failed to get clock %s\n" , aud_clks[i]); }return 0 ;
Signature · 1 line
2.43.0
PATCH 4/4 ASoC: mediatek: mt8183: Drop redundant probe error messages
In reply to [email protected]From: bui duc phuc <[email protected]>
The errors handled here are already reported by the called functions, either directly or deeper in the call chain. Therefore, the additional dev_err() calls are redundant and can be removed.
--- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +2 -6
@@ -809,10 +809,8 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)/* initial audio related clock */ ret =mt8183_init_clock (afe); -if (ret) { -dev_err (dev,"init clock error\n" ); +if (ret)return ret; - }pm_runtime_enable (dev);
@@ -903,10 +901,8 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev) ret =devm_request_irq (dev, irq_id, mt8183_afe_irq_handler,IRQF_TRIGGER_NONE ,"asys-isr" , (void *)afe); -if (ret) { -dev_err (dev,"could not request_irq for asys-isr\n" ); +if (ret) goto err_pm_disable; - }/* init sub_dais */ INIT_LIST_HEAD (&afe->sub_dais);
Signature · 1 line
2.43.0
Mark Brown
maintainerRe: [PATCH 2/4] ASoC: mediatek: mt8183: Fix APLL enable error handling
In reply to [email protected]Quoted 12 lines · On Wed, Aug 19, 2026 at 05:18:47PM +0700, [email protected] wrote:
From: bui duc phuc <[email protected]>
Currently, the mt8183_apll*_enable() functions call
mux_setting(afe, true)but do not check its return value to handle failures.In addition, the cleanup paths of mt8183_apll*_enable() do not call
mux_setting(afe, false)when the enable operation fails, while the mt8183_apll*_disable() functions do.Add error handling for apll*_mux_setting() and call
mux_setting(afe, false)in the cleanup paths when mt8183_apll*_enable() fails.
sound/soc/mediatek/mt8183/mt8183-afe-clk.c int mt8183_apll1_enable(struct mtk_base_afe *afe) · line 390
Quoted 7 lines
sound/soc/mediatek/mt8183/mt8183-afe-clk.c +6
-1-apll1_mux_setting (afe, true); + ret =apll1_mux_setting (afe, true); +if (ret) { +dev_err (afe->dev,"%s apll1_mux_setting fail %d\n" , + __func__, ret); + goto ERR_APLL1_MUX_SETTING; + }
apll1_mux_setting() logs errors, do we need to add another log?
Re: [PATCH 2/4] ASoC: mediatek: mt8183: Fix APLL enable error handling
Hi Mark,
Thank you for your review.
Quoted 9 lines
sound/soc/mediatek/mt8183/mt8183-afe-clk.c int mt8183_apll1_enable(struct mtk_base_afe *afe) · line 390
Quoted 7 lines
sound/soc/mediatek/mt8183/mt8183-afe-clk.c +6
-1-apll1_mux_setting (afe, true); + ret =apll1_mux_setting (afe, true); +if (ret) { +dev_err (afe->dev,"%s apll1_mux_setting fail %d\n" , + __func__, ret); + goto ERR_APLL1_MUX_SETTING; + }
apll1_mux_setting()logs errors, do we need to add another log?
Oh, sorry, this was an oversight on my part. The apll1_mux_setting() function already logs the error,
so there is no need to add another error message here. I’ll send v2 shortly.
Best regards,
Phuc