From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFC4B47CC92 for ; Mon, 5 Oct 2026 11:04:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791198250; cv=none; b=jGNunmz28HuGihdQNzZzTZJPl8fMkFk13eVg9ELrsv+cUup42YxwbQLAZQ0oxjfY11aZQeVAGW3+Pk97TzvdHyE05d+T63BrXmWp39AFkVCRIp6CwTOahUBVr5F6pU/o6tm8ZbyBYBS4fmD8ens6We9sNBcEsUigEf8KzRJTgWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791198250; c=relaxed/simple; bh=RFsDwGuziZnLQYvPIagibDKiLenJn663Co716dknJHM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IQX64z6yq7kL342wkOLHE0vJyEsBZxK1cFS23h7r0ZKOpxdaS7Nhm67+j7VQzJQJIh9mBKgGwCmnz6QrIpVBeWuOA0nCWEW2i6lSyDlFjIdg7iAmLjBhISbUhb/kivE4b2MeH1Ao6CboxvyJhZn1BxhzR9+UkhyAm57kckNSatk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iJ9EJvnX; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iJ9EJvnX" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-cc4aa18f9afso619069a12.3 for ; Mon, 05 Oct 2026 04:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791198248; x=1791803048; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=cC2JxcNZX/PdxSljMsgobXdfIwmK8OmUL2fGB78jIko=; b=iJ9EJvnXZKGwgX60waPqk6/mC5h9UKciD2jHQeonDlW+grHlgGzLPswVk2/52DLQuP top914lqsjFqeKht1xJI5+Y5zGz3w1aWtfKukuWsaFXxGVlb1Fx8mQUZbRS0mSF5/utn ct2DYt4kVMhwIbpSFilFGF1aHuQ4SttZ8YstFYKKw69jmJXFVPvYiBuRRtMrlx0vpjk8 Z+tbOZWPjQdVakL5agrbK6+mGwb1HEkZgwSh5SPWiMdMurFbQuXeZN8/lTYFxLp0Iffx W+JAYZXaNceR9sUmJNKsbP6GHZyxUNcKvELz1W30/QIxIIM+2YZbtqTpa6l2NFbCk3UV YnCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791198248; x=1791803048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=cC2JxcNZX/PdxSljMsgobXdfIwmK8OmUL2fGB78jIko=; b=hObd26Qf7DemIsEL+d4lmSrQIFEWM7HMuRjFUgGANlA5M1lv8Y3wRM3czZLYarZo67 ImwXSDI+927tpMUelc0fWlFeAhI9Bt9EqFm4szClV7cqdmOoiZq41YOc5z+Re3ilLcwf V7V24E+6uUCZ4MXhuUQAlvCxMb07aDEKBXgtnB9QaodpEmEfLSwZGTDWwreP4qRGbNxd VPH79oKDKKgZ99HloFeiW6xO1UHYqKNLf7b2xchVfCPV14GFZisSL7YLXHezFRrSn6Pv OkNCSxbrmjTdZN2zpgaTWGiCyo2jSgSK2Lo6W4jLIMu85UrQufpi9ueiRF/f49L+8mWd Rghg== X-Forwarded-Encrypted: i=1; AKwUvBwsFCJiMBozbB76Qj6Ho2kwkeqG2DeAy2ezuITFzbTrVmEW7pJCEQwPxpJ4w0hRyXmGawCCMGf7VrpBSm8=@vger.kernel.org X-Gm-Message-State: AFuF++lScXK0fv5Q0CEXqWAruqiM2Kgt0C3M73mq79UTRw6UzB1wXDnh mL06njh3iD8RAY1HeIAkPM4Gv2G9czlyTQanfs6OeHYEApVssT5959UY X-Gm-Gg: AYBFou1ID8mqZkB/qaz52G0GlF8uXu6rT0vvaK00sgCXv0zX746Zf8A4AlNPzDWhQVD OlaFYUZF0rqTLOMcqdvg1tkBfKx3x2w49QjY+w1d9Vx/QDgXmJhLg1W4yMlTbFQ/bfPAnJsnoQX sKRjjUsg+QeyOsFZRjt8T5+PSvusy4vny5p0JPJCtNn7mKQEWRlMSYe3EODvqoE9rvvE7OBp/XK UutKyjF37o+IUIS72cSey2tj15fijfS0t0p35LPTkw2SZhcmKMjNl48GF4hpgrwSCYksNH/66gK /gOLYuO3EmKXd6BnwYNUd0dHmqDAKZAAImzG5N16Udd5NvPhnrOQGVpUMPL4QOwhmaIvDis/DBm MY8sfs0tiYzm+2FDLzLyCsYRewnJNyiy2AxysD5y5Xw6CV6davuJokY/mdWJlEuEhyNBZudTqWi Bj3tGghIp4yGlVr1hfDjERSw7RQwkg5E/c77yKXuUb2kVrR+qs+0uukkwQwQNBG9G5of8O41mV5 U5EyOMy7DHsQjEj0KXU1laPRcEnodEQD3Agx0YhTEh+Mbs2LdwaSKHESBjBuUXl/8033X487W0u OahNx2ir5/7xCg== X-Received: by 2002:a05:6a21:9089:b0:3de:5a86:9dca with SMTP id adf61e73a8af0-3e0d6b554ccmr6744719637.19.1791198247726; Mon, 05 Oct 2026 04:04:07 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cce6d334de5sm626498a12.11.2026.10.05.04.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 04:04:07 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno , Trevor Wu Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , Kuninori Morimoto , cassiogabrielcontato@gmail.com, Mukesh Ojha , Liviu Dudau , Haotian Zhang , HariKrishna Sagala , linux-sound@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH v2 11/14] ASoC: mediatek: mt8195: Fix ETDM startup error handling Date: Mon, 5 Oct 2026 18:02:54 +0700 Message-ID: <20261005110257.50145-12-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261005110257.50145-1-phucduc.bui@gmail.com> References: <20261005110257.50145-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Check and propagate errors when enabling the ETDM MCLK and clock gates during startup. If enabling a clock fails, disable the clocks that were already enabled to keep the clock state balanced. Fixes: 1de9a54acafb ("ASoC: mediatek: mt8195: support etdm in platform driver") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 50 ++++++++++++++++----- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c index fba51c552eec..1270fcac6b3f 100644 --- a/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c +++ b/sound/soc/mediatek/mt8195/mt8195-dai-etdm.c @@ -1575,36 +1575,66 @@ static int mtk_dai_etdm_startup(struct snd_pcm_substream *substream, int cg_id; int mst_dai_id; int slv_dai_id; - int i; + int i, ret; if (is_cowork_mode(dai)) { mst_dai_id = get_etdm_cowork_master_id(dai); if (!mt8195_afe_etdm_is_valid(mst_dai_id)) return -EINVAL; - mtk_dai_etdm_enable_mclk(afe, mst_dai_id); + ret = mtk_dai_etdm_enable_mclk(afe, mst_dai_id); + if (ret) + return ret; cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(mst_dai_id); - if (cg_id >= 0) - mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]); + if (cg_id >= 0) { + ret = mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]); + if (ret) + goto err_disable_mclk; + } mst_etdm_data = afe_priv->dai_priv[mst_dai_id]; for (i = 0; i < mst_etdm_data->cowork_slv_count; i++) { slv_dai_id = mst_etdm_data->cowork_slv_id[i]; cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(slv_dai_id); - if (cg_id >= 0) - mt8195_afe_enable_clk(afe, - afe_priv->clk[cg_id]); + if (cg_id >= 0) { + ret = mt8195_afe_enable_clk(afe, + afe_priv->clk[cg_id]); + if (ret) + goto err_disable_slv_clk; + } } } else { - mtk_dai_etdm_enable_mclk(afe, dai->id); + ret = mtk_dai_etdm_enable_mclk(afe, dai->id); + if (ret) + return ret; cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(dai->id); - if (cg_id >= 0) - mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]); + if (cg_id >= 0) { + ret = mt8195_afe_enable_clk(afe, afe_priv->clk[cg_id]); + if (ret) + goto err_disable_mclk; + } } return 0; + +err_disable_slv_clk: + while (--i >= 0) { + slv_dai_id = mst_etdm_data->cowork_slv_id[i]; + cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(slv_dai_id); + if (cg_id >= 0) + mt8195_afe_disable_clk(afe, afe_priv->clk[cg_id]); + } + + cg_id = mtk_dai_etdm_get_cg_id_by_dai_id(mst_dai_id); + if (cg_id >= 0) + mt8195_afe_disable_clk(afe, afe_priv->clk[cg_id]); + +err_disable_mclk: + mtk_dai_etdm_disable_mclk(afe, is_cowork_mode(dai) ? mst_dai_id : dai->id); + + return ret; } static void mtk_dai_etdm_shutdown(struct snd_pcm_substream *substream, -- 2.43.0