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 CF281C001DE for ; Sun, 13 Aug 2023 16:03:40 +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 CFFA8857; Sun, 13 Aug 2023 18:02:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CFFA8857 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1691942618; bh=ISOphjDrsW6TjiazSKyOZf0nG3NXWsbXvGngRyQWbPk=; 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=cFIucW5gytRUuU+NLRnyasVy+LpJHkEax5ewOMtKfpRdnZk4wVlae+znS0UkR7cEE 9ZrGJlczelfVMDlfkL/J+3/URGEA2Lm243eG8ltCWFw+cPXOlzgoh5/xjpFGshJhIK UergACBidoq4N3HA3VYfZ9NLjSscCjvVBawSDMSM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 51B32F80016; Sun, 13 Aug 2023 18:02:48 +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 9CB61F80551; Sun, 13 Aug 2023 18:02:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id CBA22F8025F; Sun, 13 Aug 2023 18:02:42 +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 E5793F801EB for ; Sun, 13 Aug 2023 18:02:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E5793F801EB 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=dYCxjkBG 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 1B1896358C; Sun, 13 Aug 2023 16:02:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C25AC433C8; Sun, 13 Aug 2023 16:02:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691942558; bh=ISOphjDrsW6TjiazSKyOZf0nG3NXWsbXvGngRyQWbPk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dYCxjkBGtysMInJe6laFUS+IRjqUC7NnROjdg/Ji+Y6Ezwozk1KurjyfuU9GNPpnr qJBQiGrLy1GPLytu02ixazCg0FSZrN7YhZzthc7FLdZr973M2jl7/OiNqAYB22DOX1 7UAlVTbPG+NauA40Dltk2PXGdNFKR5C+Qs34IJj7XiOCmk96RtElRU/GOBaQLj1Mpr /XofShx3Jj3UHfHeSG/dEsHBCeXCL7GZcKnf3YbAbud8ciXLpUkTidpj+Dr/JKaPWV gNQ6e+1Ye73xK+bSxN1vGxE0tG+9p0lXbDQmO/qDAC42VTnPbhRioIkUIS1vwA1CZ/ o80BrqQRyKqbA== 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 6.1 24/47] ASoC: rt5682-sdw: fix for JD event handling in ClockStop Mode0 Date: Sun, 13 Aug 2023 11:59:19 -0400 Message-Id: <20230813160006.1073695-24-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230813160006.1073695-1-sashal@kernel.org> References: <20230813160006.1073695-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.45 Content-Transfer-Encoding: 8bit Message-ID-Hash: ETWURPMVVBT6V4HCGGAWCVEKSGXVKLOW X-Message-ID-Hash: ETWURPMVVBT6V4HCGGAWCVEKSGXVKLOW 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 02fb23d72720df2b6be3f29fc5787ca018eb92c3 ] 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/20230721090643.128213-1-shumingf@realtek.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5682-sdw.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c index c1a94229dc7e3..868a61c8b0608 100644 --- a/sound/soc/codecs/rt5682-sdw.c +++ b/sound/soc/codecs/rt5682-sdw.c @@ -786,8 +786,15 @@ static int __maybe_unused rt5682_dev_resume(struct device *dev) if (!rt5682->first_hw_init) return 0; - if (!slave->unattach_request) + if (!slave->unattach_request) { + if (rt5682->disable_irq == true) { + mutex_lock(&rt5682->disable_irq_lock); + sdw_write_no_pm(slave, SDW_SCP_INTMASK1, SDW_SCP_INT1_IMPL_DEF); + rt5682->disable_irq = false; + mutex_unlock(&rt5682->disable_irq_lock); + } goto regmap_sync; + } time = wait_for_completion_timeout(&slave->initialization_complete, msecs_to_jiffies(RT5682_PROBE_TIMEOUT)); -- 2.40.1