From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 729D34FB9B5 for ; Wed, 14 Oct 2026 11:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791977349; cv=none; b=HkXjFn0wGDc0EyP2YP+hZIWaa4v8PPOBfVZGztSBT023+3IbB2DNrhmCG2aWLaQ82+KmPe2S3VLkZOvZFX8iANX1Kja4gZfc++HW9zDa64mSK4ao1dJorkmJXTxLatW4FrPwmsfdhD0Okzdd/Mqg9MYoWg294KxR+imCrmT/k98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791977349; c=relaxed/simple; bh=jg0giRv6JVfianNWlTJu/+VIMoOTvPzRaWVz73ZGKoc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TynBa5iS7ZzDWIqOGmX/bSYfAeHvEFvYdVCvC5BaIlQSGlUF/T4qkoWYkxewEerUTDBQ8aVaZeeqptO2Q7HEY8zV0rNMX2GCirbyCgqTOOU0E0BInqO6rQV6lxtYw8K2MH8XNNyOJ2M3XkIa4RF3bucPXMYY31C8th4Yk4FIgXc= 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=FryWiUc2; arc=none smtp.client-ip=209.85.215.173 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="FryWiUc2" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-cc7e79c1eaaso1716171a12.2 for ; Wed, 14 Oct 2026 04:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791977347; x=1792582147; 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=odTbZLgwCb6DBPfwUfr7A5D1sZLLXU7jZEEh/Gyu020=; b=FryWiUc2g4jquID/xL9sTLFTy2m0VjV4c4xSOnWmk1QkqzQ2RdprAtVFdC+bXzYr9Z wP3LsTROK6s3S4aMZDE9aN6/UWPA4Xp8eyYW92KRRsLxiI5MYK8fujo/WHxagcmuz7xq yzj1g+212hDHpqk0ljLWssCQ8mhe1tL5HXBNo6tuhQTdYDmeBVQYw+Exg3ZEpnjLhhp9 dDtRNscYLbN0UxagoxoQNn6cr4OSxA7ZeXeAC6lUBshr26uIiTFpvXRVDoAuH/9KQIYH YWfl6FLOpTYzyZWTb0ZXedKMwHeJBTv28d89E2FJrDh0VmCYEnLT31HZoDu1jZgbd4Ti PooQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791977347; x=1792582147; 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=odTbZLgwCb6DBPfwUfr7A5D1sZLLXU7jZEEh/Gyu020=; b=y+mvGCQfBrZzK4yye/8zfzU3ShLoRHoOBHyCuTAiWXPHwdBoEVWM7XcT6OM+G85geB XB2cuR+WDlS9/mv1Md18xcbPmGTJ7ClYru7p2FiWAwiPfuj1iqa5SaUVRt7rGVbs0pQI pvSrDa+oBGCwetiSTm3sf7BFkvrXU/JLa/eF7yzXfTR7laROBb2I5bdcFTuvBpXi/vni kcYb3cfBPvGok/h/yx5bBxWTYPRknBd6QfwpzyyZb0vpaA3maNFri9fqkbjT2kSdZ1ht 9zsKqgHpPgXpSiZTD/e4dGiJmI7I4lZjlv8OEuqv5q8bpHN++HaCX3qX1b7Pfs3ydhnv DhjA== X-Forwarded-Encrypted: i=1; AKwUvBzxZ+0tp4qjHNNH1x2Ek3LlDjGbjWNnvLZKywl2LKKdse9TVS9RIhJwnrV/vGX4UmrLIF5RLOx+lkmxYwE=@vger.kernel.org X-Gm-Message-State: AFq9FYIvpIgaSXouB+JZ/udbUZHdsxuKt3W6vM2xSWuyQpumQk5ALzPy dXBvC2kHyNjpTXhtHAEFjwFjB4gnlZ8YPyDbOr450vL17LSwdtEeVaPK X-Gm-Gg: AYBFou3GKGqmxTlhpEXMkBdp2JUGixMcjscGSJWQrW7YsvaqZJvk/HBNq4AFJUHTlVt NtADrj6IbYcaNVM0MraSSusYROPimjJATea5DPizhZwkUPZD/Y3qf4t1yRACsDuwwtfWjPeJhTD Yd4IebQCM/uMgk9U6T9oRCmyQ/gj9Lab7oIQqXEFfbNRpNlADGdqdUwA7U/QGiVQoBgMGKiRV8T riINq5pDcaQirg19hVooUcPnoeIO1n9IEg6jPDTS4fnG35Bsc/RWskGE05jY1APP+NhNQ95HST2 3gx+9x2fc+upr8ZOVsfGcfjm7Dv1FrFuP7WEfqcqVdYoHs2Ar9ayvIsuX3/gqR16sv1i3SA7C2+ RYT9HXZx34dzVg5RpgmamcxI23TvXE5acOD5Sd4QhTfYDNPxjwcKyZ3VkMuaP3WKWszJbuODFNy X9CPN2McdndtVLYHLd4NFrFHJboSvnhl5CW9Wsinfp/BxIoytNYoOkq32oe4qwW3VVL+OUsiIOr 1EBbxLO6MT7ZgHdtTPA+xBHp15YXJQfCJVDkp8YpgXLAvZKypDvFzXKJtler9baIfy47jf4raE8 FkosKuVWE30rXA== X-Received: by 2002:a17:90b:5343:b0:3a4:e934:e85c with SMTP id 98e67ed59e1d1-3ab3accfc54mr13243703a91.41.1791977346715; Wed, 14 Oct 2026 04:29:06 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ac61171feesm4077076a91.17.2026.10.14.04.29.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 04:29:06 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno , Trevor Wu , Ajay Kumar Nandam 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 v3 09/16] ASoC: mediatek: mt8195: Fix runtime resume error handling Date: Wed, 14 Oct 2026 18:27:44 +0700 Message-ID: <20261014112752.683032-10-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261014112752.683032-1-phucduc.bui@gmail.com> References: <20261014112752.683032-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 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 --- 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 4216c47a56c9..19047887ee21 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -2965,18 +2965,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