From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4E1C8C9832A for ; Tue, 29 Sep 2026 06:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o1ihgfA2Xx/YQxYVKmUYf4V9Nz+OYG4xbe0ZFsfUP2g=; b=qeIrgyhp+IdVBZaqWBIBCP37J7 iiktMP8rt+ZCVmCQxLA/Pr6WFcxshaOZQg7uSM7woaRqHKTKwC1r+FByRLCmAgPXAgMFYcWqnTuHn tPM6y0pdrssqESxQWE6HsyngQS4dpoeSRvxeyv/R+xI53iJU7za1rrFGCCzu7F2pAUGhxYaU+dnTw rSMWPOXwwJjTJmwlcjvGmixhoHPoDi2mPJ9xJG3n3b687AQyxLEffu6tgkbH1lSLb/eJdD04hvEXn adjlZDXZJh0CJkSmtrQIsGGBiuYa5BuEjY+tpZBKKH63m9qDVS426qknXDkHB2C/nGJs5F69ziAz6 NKg83Deg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBR5U-00000002QNh-3inQ; Tue, 29 Sep 2026 06:13:12 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xBR5F-00000002QBX-1qdz for linux-arm-kernel@bombadil.infradead.org; Tue, 29 Sep 2026 06:12:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=o1ihgfA2Xx/YQxYVKmUYf4V9Nz+OYG4xbe0ZFsfUP2g=; b=Y0O++ZpJ2RpR9YNFhf+K0IjujU 5rz9Juq8EDSKEPrkIbhqkebkWlXF8C8+5IsZ1571l1sun4/z3sO8av+G2L1TxbQcGsu0KEjOP5jnj HT5sHqxNbTZUx0vCY4PmrOb/ERNS9RwAiKF4OREXQATUtAxuqYmEGgIgnIWupR/0727YW5NUOSNiK GqnK12KdPlaJY+b0vuuXoa0S+d79/7UhcB4NGxLUkd43fNuA1zMoe0kkVZtOPXM82G1INXhjDxI+V mSMS7Gq3IAWPgF4xW625B+ZnNotMqn1z6JVLZkbq0olcDvZ1jbKEZwJopZryyk/tTT2CKSEvU8l8j z7Kpo+1Q==; Received: from mail-pj2-x2b.google.com ([2607:f8b0:4864:39::2b]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1xBR4q-00000002EZb-1IOt for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2026 06:12:53 +0000 Received: by mail-pj2-x2b.google.com with SMTP id 98e67ed59e1d1-3a47d6146d1so768305a91.0 for ; Mon, 28 Sep 2026 23:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790662350; x=1791267150; darn=lists.infradead.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=o1ihgfA2Xx/YQxYVKmUYf4V9Nz+OYG4xbe0ZFsfUP2g=; b=ezIv2HjcImQkDvBGfYI67UyCa8EpFjpKnFBPWYjP9VjWKcgEq8abivyPta0XHp1vg3 MH56mBlbYit44f7L3VWLSySVXNkQnsY9Ga6kNBfUNNbjGNQmLndzfc7J/R/fURw78nTX 0+ICTmFJm0Q1sCPNKFQPeYRIPulfxKFmE8pKzI3bEycsIlJUJ8gTPVaTg/23gVOyg56K PhhlqtETks6exBWZsDszcdTI1QIMIvNJoAFYrXs+KlI6OMPATqkbXDR4DJ7vffQ9hEGS STnTmFBww3v0aKEi8njFsQhcfcP1p5i5miToA55/CDLoi/KEb8T7gnyT4TMM+jvhjBkG kcvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790662350; x=1791267150; 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=o1ihgfA2Xx/YQxYVKmUYf4V9Nz+OYG4xbe0ZFsfUP2g=; b=VhTLiebm7IJG7s9gEWnQ3hSjEZPrhSDh6nhYym0EYQse8hKAUIg232HmRtHJSsV8ge 2z41U/w7GL4Ar7tyMXyx3ZfODtdQk8aYoFDxeQYvxgWYbiO4ARJFEp6xGv4PPH18rbj/ er/BvDUhE/b3LiZa/28NxRUHn6oQYM5LgPV61sSdeXR3Pto3Q8ZfZc0gwWCaa/qdatpd ArqrW4TGBpqUdUAUXK0ZsmXXF9hyS2po+JGXoT3ImTaYf4hJwnNplYYwGqg14sNkKtx1 oNX5a9Kk4gCbUmoZII4RL+fZmGk9IYogSuKPLbUEwEDf5xk6Li50hpGeyvcfzbYULFfa S+xQ== X-Forwarded-Encrypted: i=1; AKwUvBycsclvphmGnMyG8xAZl8hSCFGDQxLWpUM3vR2GQEyvhvkqLeZW/B4pUHue8atDkG7Zzac3hkrIErWCwzTIcnuj@lists.infradead.org X-Gm-Message-State: AFq9FYKk27LqlmjflAvfCDVui80YPj9+D65Hp08WERorHAfHs2VUDubQ bMj+dUSF+Y7YtCNRVEYLaRXAIvvva+N49MBxMk1nJacmrq70SUWckkXF X-Gm-Gg: AYBFou3168dAa5ljLXKWBuYpmaFG2S1LZwP4PcNwF83W2Nk2ZbMI80GgfDDGQhZPQbw jW47dTxc2h+t4Hdkn1C3buuN1ZzHwZqX4N+1Aa2Kz0AbcI8++uRdRJPdMKx919Xmq/b07N/N2D9 to/8RA5VJr9BkbvicPCxd+nsHbi5vv+awbj9fUTNA13Gu5Jfg404g7q+3s94YIdxWSDKkQAr4TG 087aVxBvpWjd/FBimtr5XQQxox3i1CBoCA0vBnxqJZN+qhEk9J53F22nB0AxKMqLyjiXYQThbnD SJssOk/4oBD9fZzwjqTKMDc+qj6CjUQhxD8zBCbAca/G68RDbYQl/PH3MvAiycToiED2pkTEE6d S4UggLcdLzimhJ3uixpWKeTilRPum2QcDhlaC/h3a7+pag6a9n7xIGNUWrxBm3KDLDe0DIHgcOJ +IDEUxvyDKfveiKg78zn6vt3vZh8iUuc2c5iy66pFXXfGSAkDDxFEmgg6Ch4EYX59Px+eRm6nyc 62QTUi9yCxT/GD/XwDvb1z8JDbd12fykX406C9hk6vtwSMuY+Z4Dq1SAclObnIoNPsvg+iFxM5t jbHMpLoG709SFg== X-Received: by 2002:a17:90b:3c0d:b0:3a4:6ff5:778 with SMTP id 98e67ed59e1d1-3a46ff510efmr2033501a91.44.1790662349906; Mon, 28 Sep 2026 23:12:29 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a498726d63sm3280965a91.17.2026.09.28.23.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 23:12:29 -0700 (PDT) From: phucduc.bui@gmail.com To: Mark Brown , AngeloGioacchino Del Regno , Darren Ye Cc: Liam Girdwood , Matthias Brugger , Jaroslav Kysela , Takashi Iwai , cassiogabrielcontato@gmail.com, Mukesh Ojha , Liviu Dudau , Cyril Chao , 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 07/10] ASoC: mediatek: mt8196: fix runtime resume error handling Date: Tue, 29 Sep 2026 13:11:18 +0700 Message-ID: <20260929061121.124001-8-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260929061121.124001-1-phucduc.bui@gmail.com> References: <20260929061121.124001-1-phucduc.bui@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260929_071251_946744_927169F1 X-CRM114-Status: GOOD ( 14.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: bui duc phuc Propagate errors from regcache_sync() and main clock enable operations instead of ignoring them. On failure, restore cache-only mode, disable register access clocks, and clear the 26M clock request as needed to clean up the runtime resume state. Fixes: 7384ecab34eb ("ASoC: mediatek: mt8196: support audio clock control") Signed-off-by: bui duc phuc --- sound/soc/mediatek/mt8196/mt8196-afe-pcm.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sound/soc/mediatek/mt8196/mt8196-afe-pcm.c b/sound/soc/mediatek/mt8196/mt8196-afe-pcm.c index dcee037991aa..9888812cd993 100644 --- a/sound/soc/mediatek/mt8196/mt8196-afe-pcm.c +++ b/sound/soc/mediatek/mt8196/mt8196-afe-pcm.c @@ -2211,7 +2211,7 @@ static int mt8196_afe_runtime_suspend(struct device *dev) static int mt8196_afe_runtime_resume(struct device *dev) { struct mtk_base_afe *afe = dev_get_drvdata(dev); - int ret = 0; + int ret; ret = mt8196_afe_enable_reg_rw_clk(afe); if (ret) @@ -2222,7 +2222,9 @@ static int mt8196_afe_runtime_resume(struct device *dev) goto skip_regmap; } regcache_cache_only(afe->regmap, false); - regcache_sync(afe->regmap); + ret = regcache_sync(afe->regmap); + if (ret) + goto err_set_cache_only; /* set audio 26M request */ regmap_update_bits(afe->regmap, AFE_SPM_CONTROL_REQ, 0x1, 0x1); @@ -2233,10 +2235,20 @@ static int mt8196_afe_runtime_resume(struct device *dev) CPU_HD_ALIGN_MASK_SFT, 0 << CPU_HD_ALIGN_SFT); /* enable AFE */ - mt8196_afe_enable_main_clock(afe); + ret = mt8196_afe_enable_main_clock(afe); + if (ret) + goto err_reset_26m_req; skip_regmap: return 0; + +err_reset_26m_req: + regmap_update_bits(afe->regmap, AFE_SPM_CONTROL_REQ, 0x1, 0x0); +err_set_cache_only: + regcache_cache_only(afe->regmap, true); + mt8196_afe_disable_reg_rw_clk(afe); + + return ret; } static int mt8196_afe_component_probe(struct snd_soc_component *component) -- 2.43.0