From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f42.google.com (mail-pz2-f42.google.com [74.125.228.42]) (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 CD9B147DD63 for ; Mon, 5 Oct 2026 11:03:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791198230; cv=none; b=YDB1YoTf/vXfwkY/wXAFauF2phuOPZmOCXJAPZ5iHHnhwIHxx9uj/hweT2NRh8XuQ+cFxiJCfCpPv87WqEUpoEb7kU8y7Y8DhOX0A+aJMT2CgdbqxYSQ7arZDPFBJA3iGtzxW9bN45Avy0wyDc/0LBLko8U5QzdQS3npHmhJmjM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791198230; c=relaxed/simple; bh=f+tJ3dmrXsandOwpdq8gnFCHqTQ4x42Fxlbz795xbrU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XULTFwy6pnV27Dq5KIHm6XXelwLhAY14tb7Bay9Y3Ui69AFyXiz4bwgdwgFBRurC9zfw5jOjSbh7tIj4xz5tAvWmqPypa29R/PVAZDUubBw7aQU80XnPfgThx9aSPg1I3qjJdS58/6qp4jLvlB/2t9+cCdHBG5EIbtGiEr726P0= 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=m29reesL; arc=none smtp.client-ip=74.125.228.42 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="m29reesL" Received: by mail-pz2-f42.google.com with SMTP id 41be03b00d2f7-cc4aa0f1766so720111a12.0 for ; Mon, 05 Oct 2026 04:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791198228; x=1791803028; 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=leelaKplSlz0zBQy959ImAMYPwrGQGI/LdumbuDxIKU=; b=m29reesLY4FU1dBXZs7U9hZSuLFHDwBDGsmOETHjoh59Xe2C6Di9dATvpYq/yf/jdx 9++zfffrCoesarazipvAn9eG9hVF7LEMCdFopsUgE0W0JmqFBwPo6asHYbajZ4nJMJBa DlY192eUw3JMedzGJNvqsbefrZRDEpEdy9hZryho0trhNmDzbjj8y847eWwI9bXF+1xU IAQePM9bBK2LydCmmYLuAPpGRCQNfd2sY44V+tSc/AagFsSoSFbe2dzfznxTZdQPBoBW 8Qvks5MnlI2vTw7MjZjDA3ASOxoBEAItiS6+iHu3BhzXJiJuPAqrPN3o4w4H38BkNGx+ zNaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791198228; x=1791803028; 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=leelaKplSlz0zBQy959ImAMYPwrGQGI/LdumbuDxIKU=; b=tSwGTy9E4OM/2Dmwk+0ngtO1GlsRI+FDLxkukW515b30BNwTiXwLxuzNoFocMXkWaf bZv9NETJNNS1iniY9D6Ia37otvCBhRiZolqJ2ZloTtDFwovyoDHGTD2jVDIAPEG0Ac1P zJEpKfyQACAB3D/CkjwgHfASPGrFVWj91tQt+mx24lzd/xNc7FnSUKKUN4HNVu9ao75c A1pX+l67I1BvPx/92q8zV9qyEZO5OWC3YnnBewTom/v8CMLmwnTG8kD+jphwTANJZrVa K7gHHuzkj7L86fxgWf75c/SIUwjU41v8z6Apkwf7AV85oj5NMEQgJvt0J/AFPR0Xxyyc WmCQ== X-Forwarded-Encrypted: i=1; AKwUvBxULb8fxZeOTJDTfa3+AEXh8/Im9/UFbLV4G6Fm62N4R6pszk8WJxf4V7U4OkoxFEvAWuRctDXPpHto5nE=@vger.kernel.org X-Gm-Message-State: AFq9FYLT7++A/okPuGBP9V533b651oNss3id7f9PuxcYHM2gRb5j5jN7 JZ1N4RHYsX8zwd2PWpuf6q/tgI1v0RjQpH/gO2PwdMYhnHfV683Buokh X-Gm-Gg: AYBFou03URhKpmi1Nh90XXdQtym+ZifI0Hz93ZBW7JuFjglwQEyCS6S2iPoLs2uiKET Lg7dwBqQw0NP5Ky/ByIdXGt/PxKaDXlES/0CzTs9v3HbYSmhiPsLzXmTsQNxcdpU4exD+C2VCD/ HJLmzLUl7baU3nf0nLU9Tq9Mx22xleRpoGqtUPbjR183xDCi+zksziIflNGLrdubzW+qnXaz+jj 1eWjSBHtDwUHhqZJNzW1hJCGojj916lcNlHaUd2UJK8ncT+Mf/j8yKlYPKMrIhoCl8pYn1x39W2 rqbMR0IqcCm9mBGqb2la4Lf9Eph6DSWKv5teKPjMjepmXDelXYCWEMGdFZxTqGXsgaP6VzKCP9e dnp/WoOLcjHhCARKcz5DF2NQTujaJwDhjMO8vl5CWOAuCRlQ0P4YoSH+I4k/4E4/LquB4cdm6Xo 1QQ/YusPkJFfzSLyUah72UwceXMmxY2B+0H/dh9nal4jo26KoZtSUC1HeZYG2hc6drs7d5easy3 5mk6jFPZCaFJCNYuVQZHLS5XOLiVD2Z/Eweq8dnVPET1iPb8OzuAOSEb4CIukl4+Q2anA/tB3Hg bsomEsTh0g2jWw== X-Received: by 2002:a17:90b:2b4b:b0:39e:4546:fb13 with SMTP id 98e67ed59e1d1-3a6cec143cbmr8426958a91.19.1791198228110; Mon, 05 Oct 2026 04:03:48 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cce6d334de5sm626498a12.11.2026.10.05.04.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Oct 2026 04:03:47 -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 07/14] ASoC: mediatek: mt8195: Fix runtime resume error handling Date: Mon, 5 Oct 2026 18:02:50 +0700 Message-ID: <20261005110257.50145-8-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 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 02736949ae6a..bb357cc674cb 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