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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 1BADBC04A6A for ; Sun, 13 Aug 2023 16:09:29 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 37A58829; Sun, 13 Aug 2023 18:08:38 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 37A58829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691942968; bh=Cyy2rayxpDKwC7nQitE0EVGQAfNmuElMaHb15QI7kpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XaI0wl2Hvqmv7Vrs64k1Xz6Qc9FMq1maBfLfnOw51tNRCdB3c+tfCjcYNCF2JoelK iY/5sdn/1GVeNc94t/FaVus+bZruB360j+sKkzDR5m/JvvA/qarfr906Xr/j9wjGz4 6Vp14mw54g9H6HXHOgs/A7s58Gjuk/w/Bx6QwJgA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7B87DF80579; Sun, 13 Aug 2023 18:08:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 11F7CF8057C; Sun, 13 Aug 2023 18:08:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 107F6F80551; Sun, 13 Aug 2023 18:08:10 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 717D6F801EB for ; Sun, 13 Aug 2023 18:08:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 717D6F801EB Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=jtpmE95d Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5F8F1625D8; Sun, 13 Aug 2023 16:08:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DED2C433C8; Sun, 13 Aug 2023 16:08:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691942886; bh=Cyy2rayxpDKwC7nQitE0EVGQAfNmuElMaHb15QI7kpk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jtpmE95d4GvXII17BrRLoCN82KsygeaH5P2uIvKLKjN1eL8HVMx8SAJxpsz0M9W9+ EZgTzrXn0SZdENgyF6swrTNob4mCvjU16OvKUVQVu8TuB14mIWb0ImC29jEBnAPLvJ 0jOPcfbhVTvOwamYNa89a2HBqlIwNTKR8ZG6dmUiVdSBPCZXN+yM2sh+ULgeQRrzfk YA2+M2N8ZpW1ixKQXGJidx4bn+n6mWmciLZGI6gnxeqgIzyI2aqPxIZQidpzJ6T3Xe /x1QbxLda7l2vqTImMIdWHADxNVzgi+32cLj4e8EsbRcFUVNUZSb6W2XLyOEUyQ1fh j+lcPwBmvFbXA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shuming Fan , Vijendar Mukunda , Mark Brown , Sasha Levin , oder_chiou@realtek.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.15 18/31] ASoC: rt711: fix for JD event handling in ClockStop Mode0 Date: Sun, 13 Aug 2023 12:05:51 -0400 Message-Id: <20230813160605.1080385-18-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813160605.1080385-1-sashal@kernel.org> References: <20230813160605.1080385-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.126 Content-Transfer-Encoding: 8bit Message-ID-Hash: 3KXR6SJR44S7Q7O2OKIFVP5YYAQHQFLC X-Message-ID-Hash: 3KXR6SJR44S7Q7O2OKIFVP5YYAQHQFLC X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Shuming Fan [ Upstream commit b69de265bd0e877015a00fbba453ef72af162e0f ] When the system suspends, peripheral Imp-defined interrupt is disabled. When system level resume is invoked, the peripheral Imp-defined interrupts should be enabled to handle JD events. Signed-off-by: Shuming Fan Reported-by: Vijendar Mukunda Link: https://lore.kernel.org/r/20230721090654.128230-1-shumingf@realtek.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt711-sdw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c index 4fe68bcf2a7c2..9545b8a7eb192 100644 --- a/sound/soc/codecs/rt711-sdw.c +++ b/sound/soc/codecs/rt711-sdw.c @@ -541,8 +541,15 @@ static int __maybe_unused rt711_dev_resume(struct device *dev) if (!rt711->first_hw_init) return 0; - if (!slave->unattach_request) + if (!slave->unattach_request) { + if (rt711->disable_irq == true) { + mutex_lock(&rt711->disable_irq_lock); + sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); + rt711->disable_irq = false; + mutex_unlock(&rt711->disable_irq_lock); + } goto regmap_sync; + } time = wait_for_completion_timeout(&slave->initialization_complete, msecs_to_jiffies(RT711_PROBE_TIMEOUT)); -- 2.40.1