From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f41.google.com (mail-pj2-f41.google.com [74.125.227.169]) (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 A00153C7691 for ; Fri, 25 Sep 2026 04:50:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790311818; cv=none; b=WlHJaPC6wj+1zcsI5kz4kKy1hz6eKnqZQ8TQr2aR4pPs7TKUof8y/57Nb+4sxNSzfcpbrXBeLRrXiBOLLy4wPDyYV7dx72Ov8v1zR5UO1vVGAijRjd9b0O8HrcRR04R9WNFpn5QhVDMKm58bR8uaZhzeoMOtKMwGwXnjG5merdo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790311818; c=relaxed/simple; bh=75Pi527tpe9avIX9uIyazGSmLusLOPieiQVrl5PsM34=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EYTm8ZCN+D7MmdpnhNQ2I5yURdrT3+2YnlCq4u3gIv566S8kiJRtHHoO+IUlnx1tTEyrp/rh8AJwPePEw4dAFPvpljZqix3oTYhJtoo3uqBTpBTk82iAxff985v2GPTijdbq2tArPRH+6EZNgJH1/3QSmnC9ei6+SgPU4cg7kJI= 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=TFXI5HNS; arc=none smtp.client-ip=74.125.227.169 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="TFXI5HNS" Received: by mail-pj2-f41.google.com with SMTP id 98e67ed59e1d1-3a0aa9d356eso427908a91.0 for ; Thu, 24 Sep 2026 21:50:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790311816; x=1790916616; 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=jzleEuY4fxtuuqAMZY5BgUyZW117KjLIE0OgBW0FxFU=; b=TFXI5HNS27m+sLCVRCW+yiRNtiAtzdeYvmIL63uRnzvIyuDcgHA/uwDrZ1JoU25WRs xDi6kkFyNtCra8idpZfggJQgcAbvK5kAICTIa5xMZE+aU2GXbvgwitrkfjyUASJTgcbg U/TXHd/u2hutpVUpeS7fWY7YA7raG/LAYNeVVA36RCk4huY9eSjbK3x/Iv4C3OA10J/o UZ58dgSzuFeXD9jmX/LYpFnZIi+a25pVXA/hDZztG/1R1lVXgXPjKfLz+KdLr8w2sUFF PyTtsVa0M/4OXoDCB9CF/xmmc8Fh0nWAV41XJYfWfji5AFomfUjrmaQyOp96pVHf7igv hPDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790311816; x=1790916616; 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=jzleEuY4fxtuuqAMZY5BgUyZW117KjLIE0OgBW0FxFU=; b=s/gKI2ieMQUCnkp1M24ROh60PS9lk5PKjJCr+xTFHqwi9ddW87/FxXcKoFFhBbqLyK Qeuu8uYjkXwROll0dw3VDKWjlKgWSjyR+1XaXxycFgIPUOI/T+rn8KoNgvNmRKEwzrC6 ZW77mr4met0yxCXHlyrgNv56NfYNfGXZVN4JLMR/hjKBNU4yrwMtxOBRwp75Ikg/giee X6RuD07EtSVlel1LrziBtZjMTyUnEQOGKNpIKIXpW0TRGE9+R+U7kqKWYcJaIqYY+f0+ rb0xPPe5QZvVLo31xM55eqHP9vcq2zUCFz44vL+ONWd/3aRygFwLTTUSj5pVuArL0j4x XNXA== X-Forwarded-Encrypted: i=1; AKwUvBw4DSggUplJVYBHC3BkS5rft98avZ0D8KpMTdj7r5kpfK5OcfYeOU0Lvru7Tf6sL9AVq/FewRWT2Jh7RXQ=@vger.kernel.org X-Gm-Message-State: AFuF++lXiUlSFs2REziTwAlQGiWyyzqIsgcwzHN51z8eLPsaQIK0DllE ua0TNrbWaEAxdOnBfKdMqiVx9rEhS9BahiDFiVjtS4CTSZ9IQ4bN/sPu X-Gm-Gg: AYBFou0Sw8r2B37hXSLDOrP8ezOfeoKK/JW0G8wN46OFakvWSzzu+maIMxIimEeykmR 4Dd+As+FzkytXAjJH+pASQAWFBAJCTJmle8k23RkRBYfslfJXVf3EDH15xobChSlk/Ss5JbOsVz 67nMAcIeTgcYsuNMeMuDAm1YLLnvJbKxEamN43q5I3K4mL1XFTWYpqPpRg/0NaG7dtRta/qWNaa zpE/IU4tPS8aJg2S8dNbnT4ENDuYzr2eQ3MDUdp4thSoY0z9T53KNfmcwdutIWKuWrtqDkk12b7 svdt5ECfroK+cJ6Oee/eY3/tCL5aHKyfm6WuFZZ7JZNZQz5CpKBxjAv5WcIiD+2vnEzHZBxWJgb vqrpwg6sOHXH6TCopUPiyTqHOA7iyxWcQJRUbBFQ/jgSaT3C373Q6TEiR/cj63TkUORMZK6UvBr 22ILKUWl4Pa5a+8SAGm90RlXGy44RRmMdNe88aL4WXY/4tnZfPex8P6SrTiSu1+JOsbqgn+1lUi U+WiSorGlDMuIXJDhnFCVyMr02CjlYxf9dYXYXvS2EEI7lZuALsPFCMli6JDX4RXlGb4zcDDMsg +4x0QfYSWVN9sQ== X-Received: by 2002:a17:90b:164c:b0:39e:6d82:dca with SMTP id 98e67ed59e1d1-3a098df465emr3862695a91.30.1790311816047; Thu, 24 Sep 2026 21:50:16 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0976cacbesm8151528a91.13.2026.09.24.21.50.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 21:50:15 -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 05/14] ASoC: mediatek: mt8195: Fix paired memif clock error handling Date: Fri, 25 Sep 2026 11:48:59 +0700 Message-ID: <20260925044908.450775-6-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925044908.450775-1-phucduc.bui@gmail.com> References: <20260925044908.450775-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 preparing and enabling the paired DL8/DL10 memif clocks. If enabling the second clock fails, undo the clock that was already prepared or enabled to keep the clock state balanced. Fixes: 6746cc858259 ("ASoC: mediatek: mt8195: add platform driver") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c index 52c3381e6766..1d3e01e2c3e7 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -286,15 +286,23 @@ mt8195_afe_paired_memif_clk_prepare(struct snd_pcm_substream *substream, struct mt8195_afe_private *afe_priv = afe->platform_priv; int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int clk_id; + int ret; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) return 0; if (enable) { clk_id = MT8195_CLK_AUD_MEMIF_DL10; - mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + if (ret) + return ret; clk_id = MT8195_CLK_AUD_MEMIF_DL8; - mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_prepare_clk(afe, afe_priv->clk[clk_id]); + if (ret) { + clk_id = MT8195_CLK_AUD_MEMIF_DL10; + mt8195_afe_unprepare_clk(afe, afe_priv->clk[clk_id]); + return ret; + } } else { clk_id = MT8195_CLK_AUD_MEMIF_DL8; mt8195_afe_unprepare_clk(afe, afe_priv->clk[clk_id]); @@ -315,6 +323,7 @@ mt8195_afe_paired_memif_clk_enable(struct snd_pcm_substream *substream, struct mt8195_afe_private *afe_priv = afe->platform_priv; int id = snd_soc_rtd_to_cpu(rtd, 0)->id; int clk_id; + int ret; if (id != MT8195_AFE_MEMIF_DL8 && id != MT8195_AFE_MEMIF_DL10) return 0; @@ -322,11 +331,18 @@ mt8195_afe_paired_memif_clk_enable(struct snd_pcm_substream *substream, if (enable) { /* DL8_DL10_MEM */ clk_id = MT8195_CLK_AUD_MEMIF_DL10; - mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + if (ret) + return ret; udelay(1); /* DL8_DL10_AGENT */ clk_id = MT8195_CLK_AUD_MEMIF_DL8; - mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + ret = mt8195_afe_enable_clk_atomic(afe, afe_priv->clk[clk_id]); + if (ret) { + clk_id = MT8195_CLK_AUD_MEMIF_DL10; + mt8195_afe_disable_clk_atomic(afe, afe_priv->clk[clk_id]); + return ret; + } } else { /* DL8_DL10_AGENT */ clk_id = MT8195_CLK_AUD_MEMIF_DL8; -- 2.43.0