From patchwork Wed Apr 7 15:47:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Vehmanen X-Patchwork-Id: 416736 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D4EEC433B4 for ; Wed, 7 Apr 2021 15:53:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EA3D261262 for ; Wed, 7 Apr 2021 15:53:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA3D261262 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A0822852; Wed, 7 Apr 2021 17:52:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A0822852 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1617810785; bh=YefepU0YPUuujqbwqIdRpYLJZNUrxR3OjckSALCh6N8=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=M2S6JozHcSLOPhaTYmdwnM8CvTI5eQ8JpmLxm9S1mC2hGfImVq1atDlMh5kLMVUkv b70esyaRmBxnJ3skSmFTT6wZXPF9N8GIL8b3d7+Dz2Ysb1iWs6ZcGVbIbOJVjX2QQX 66TJGvEi4MANrR/pOtQ5sP7rL1OWi45F81iw5vpM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3A675F80168; Wed, 7 Apr 2021 17:52:15 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id C6D9CF8016A; Wed, 7 Apr 2021 17:52:13 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BE711F80124 for ; Wed, 7 Apr 2021 17:52:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BE711F80124 IronPort-SDR: WbN1VrEDCshtqcmwM5JkwHfhAg98LPsUar5ny9zb7jiro6uUlRROidxSnCX+u8bD5K63SQjsgL 1cbE/o+tWrXQ== X-IronPort-AV: E=McAfee;i="6000,8403,9947"; a="180882819" X-IronPort-AV: E=Sophos;i="5.82,203,1613462400"; d="scan'208";a="180882819" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2021 08:51:41 -0700 IronPort-SDR: WCBHW/EBzOCEqchv9BygkXq7P1uZtDEOzi1mf9CxJSFdkBDF1N7Dn7Y3M15jZx/aK9EDJ0UovP yLIBoyOXjJ/w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,203,1613462400"; d="scan'208";a="421758293" Received: from eliteleevi.tm.intel.com ([10.237.54.20]) by orsmga008.jf.intel.com with ESMTP; 07 Apr 2021 08:51:39 -0700 From: Kai Vehmanen To: alsa-devel@alsa-project.org, tiwai@suse.de Subject: [RFC PATCH] ALSA: hda/hdmi: fix race in handling acomp ELD notification at resume Date: Wed, 7 Apr 2021 18:47:27 +0300 Message-Id: <20210407154727.589017-1-kai.vehmanen@linux.intel.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Cc: pierre-louis.bossart@linux.intel.com, kai.vehmanen@linux.intel.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" When snd-hda-codec-hdmi is used with ASoC HDA controller like SOF (acomp used for ELD notifications), display connection change done during suspend, can be lost due to following sequence of events: 1. system in S3 suspend 2. DP/HDMI receiver connected 3. system resumed 4. HDA controller resumed, but card->deferred_resume_work not complete 5. acomp eld_notify callback 6. eld_notify ignored as power state is not CTL_POWER_D0 7. HDA resume deferred work completed, power state set to CTL_POWER_D0 This results in losing the notification, and the jack state reported to user-space is not correct. The check on step 6 was added in commit 8ae743e82f0b ("ALSA: hda - Skip ELD notification during system suspend"). It would seem with the deferred resume logic in ASoC core, this check is not safe. Fix the issue by modifying the check to only skip ELD notification processing if power state is D3 or deeper. This helps in the ASoC controller case as card power state is set to D2 at start of soc_resume_deferred(). BugLink: https://github.com/thesofproject/linux/issues/2825 Signed-off-by: Kai Vehmanen --- sound/pci/hda/patch_hdmi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) NOTES: - I wonder if there is a better way to check for system suspend case than looking at snd_power_get_state() - 'chip->pm_prepared' is one option, but this is not directly available to codec drivers - storing PM target is hda_codec_pm_prepare() is perhaps one option base-commit: 7dc53a38e4ac00d68943bab91deadc67f07d4a0b diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 5de3666a7101..a43df036db1d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2654,7 +2654,7 @@ static void generic_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id) /* skip notification during system suspend (but not in runtime PM); * the state will be updated at resume */ - if (snd_power_get_state(codec->card) != SNDRV_CTL_POWER_D0) + if (snd_power_get_state(codec->card) >= SNDRV_CTL_POWER_D3) return; /* ditto during suspend/resume process itself */ if (snd_hdac_is_in_pm(&codec->core)) @@ -2840,7 +2840,7 @@ static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe) /* skip notification during system suspend (but not in runtime PM); * the state will be updated at resume */ - if (snd_power_get_state(codec->card) != SNDRV_CTL_POWER_D0) + if (snd_power_get_state(codec->card) >= SNDRV_CTL_POWER_D3) return; /* ditto during suspend/resume process itself */ if (snd_hdac_is_in_pm(&codec->core))